RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f' 

* commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f':
  avresample: prevent theoretical division by zero

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-18 22:13:30 +02:00
parent 733db64ce0 088eca2816
commit 9bcc430481
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavresample/utils.c
View File

@ -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 {