virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'

Browse Source 
* commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a':
  vc1dec: Undo mpegvideo initialization if unable to allocate tables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-23 13:41:26 +02:00
parent eed40b2957 b772b0e28e
commit 8b85d9bfb6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vc1dec.c
View File

@@ -5926,8 +5926,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
} }
if (!s->context_initialized) { if (!s->context_initialized) {
if (ff_msmpeg4_decode_init(avctx) < 0 || ff_vc1_decode_init_alloc_tables(v) < 0) if (ff_msmpeg4_decode_init(avctx) < 0)
goto err; goto err;
if (ff_vc1_decode_init_alloc_tables(v) < 0) {
ff_MPV_common_end(s);
goto err;
}
s->low_delay = !avctx->has_b_frames || v->res_sprite; s->low_delay = !avctx->has_b_frames || v->res_sprite;