diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 00:16:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 00:16:09 +0200 |
commit | 4d1fa38d984cba322284cfce416c4c969da58f51 (patch) | |
tree | aa72fa5c5293ddfe958c5c2f4434379185a15820 /libavcodec/mpeg12dec.c | |
parent | 8c22bea57447880f2cf20abee9a97578545ae4fa (diff) | |
download | ffmpeg-4d1fa38d984cba322284cfce416c4c969da58f51.tar.gz |
avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the resolution changes
Fixes Ticket3743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
-rw-r--r-- | libavcodec/mpeg12dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 92193ce916..79fc502c06 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1263,7 +1263,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) s1->save_width != s->width || s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info || - (s1->save_progressive_seq != s->progressive_sequence && (s->height&31)) || + (s1->save_progressive_seq != s->progressive_sequence && FFALIGN(s->height, 16) != FFALIGN(s->height, 32)) || 0) { if (s1->mpeg_enc_ctx_allocated) { ParseContext pc = s->parse_context; |