diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:31:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:31:21 +0100 |
| commit | bf780b7ea8d9420e39f59d565d283806c31de193 (patch) | |
| tree | 7e442e73438ccd8a69278cc7d3680b9365c41623 /libavcodec/vmdav.c | |
| parent | b52421940f5c764237d484c5d578ebc2b1c136c5 (diff) | |
| parent | 19dd4017ab6dac11c77d797acebee4f60ad63a6f (diff) | |
| download | ffmpeg-bf780b7ea8d9420e39f59d565d283806c31de193.tar.gz | |
Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'
* commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f':
libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
wmaprodec: return an error, not 0, when the input is too small.
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vmdav.c')
| -rw-r--r-- | libavcodec/vmdav.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index e8574c10e2..cef4796411 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -619,7 +619,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data, /* decode audio chunks */ if (audio_chunks > 0) { buf_end = buf + buf_size; - while ( buf_end - buf >= s->chunk_size) { + while (buf_end - buf >= s->chunk_size) { if (s->out_bps == 2) { decode_audio_s16(output_samples_s16, buf, s->chunk_size, avctx->channels); |