diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-01 02:45:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-12 02:55:46 +0100 |
| commit | ffcd26d25bfdb64097decae60889152012e6a84f (patch) | |
| tree | a1a42e2f84f33882b693ec7199e4c2973bf76ed7 | |
| parent | 42fd94b5144ce2fba483b618aa557c8f6b78beed (diff) | |
| download | ffmpeg-ffcd26d25bfdb64097decae60889152012e6a84f.tar.gz | |
avcodec/mpeg12dec: Set dimensions in mpeg1_decode_sequence() only in absence of errors
Fixes assertion failure
Fixes: 56dcafde14a8397161bb61a16c511179/signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b54e03c9dc2a05324c08b503bfe7535c49c0f281)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpeg12dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b0e5ae9adc..00ce2a4496 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2152,8 +2152,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, if (check_marker(&s->gb, "in sequence header") == 0) { return AVERROR_INVALIDDATA; } - s->width = width; - s->height = height; s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16; skip_bits(&s->gb, 1); @@ -2185,6 +2183,9 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } + s->width = width; + s->height = height; + /* We set MPEG-2 parameters so that it emulates MPEG-1. */ s->progressive_sequence = 1; s->progressive_frame = 1; |