Merge commit '088eca2816'
* commit '088eca2816':
avresample: prevent theoretical division by zero
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9bcc430481
1 changed files with 4 additions and 1 deletions
|
|
@ -585,9 +585,12 @@ static inline int convert_frame(AVAudioResampleContext *avr,
|
|||
|
||||
static inline int available_samples(AVFrame *out)
|
||||
{
|
||||
int samples;
|
||||
int bytes_per_sample = av_get_bytes_per_sample(out->format);
|
||||
int samples = out->linesize[0] / bytes_per_sample;
|
||||
if (!bytes_per_sample)
|
||||
return AVERROR(EINVAL);
|
||||
|
||||
samples = out->linesize[0] / bytes_per_sample;
|
||||
if (av_sample_fmt_is_planar(out->format)) {
|
||||
return samples;
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue