diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 22:24:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 22:24:42 +0100 |
| commit | 6c0c799bd5869b3baccb57012d69490a0b35c62b (patch) | |
| tree | e26421c1bc5136cf9e09020543f7ddf807ee02e5 /libavcodec | |
| parent | d1c7a7776f6775cf43c3a5025d0544f0470125f4 (diff) | |
| parent | 5e8243e843be8f71da7dde199a71d095726533eb (diff) | |
| download | ffmpeg-6c0c799bd5869b3baccb57012d69490a0b35c62b.tar.gz | |
Merge commit '5e8243e843be8f71da7dde199a71d095726533eb' into release/0.10
* commit '5e8243e843be8f71da7dde199a71d095726533eb':
bfi: Avoid divisions by zero
electronicarts: Add more sanity checking for the number of channels
riffdec: Add sanity checks for the sample rate
mvi: Add sanity checking for the audio frame size
xwma: Avoid division by zero
avidec: Make sure a packet is large enough before reading its data
vqf: Make sure the bitrate is in the valid range
vqf: Make sure sample_rate is set to a valid value
vc1dec: Undo mpegvideo initialization if unable to allocate tables
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index dc97774f2b..4137b704d4 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5486,8 +5486,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, } if (!s->context_initialized) { - if (ff_msmpeg4_decode_init(avctx) < 0 || vc1_decode_init_alloc_tables(v) < 0) + if (ff_msmpeg4_decode_init(avctx) < 0) return -1; + if (vc1_decode_init_alloc_tables(v) < 0) { + MPV_common_end(s); + return -1; + } s->low_delay = !avctx->has_b_frames || v->res_sprite; |