mpeg12dec: avoid reinitialization on PS changes when possible.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 19:46:20 +0000 (21:46 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Mon, 8 Jul 2013 22:21:03 +0000 (00:21 +0200)
Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 970c8df73528659925819dec31c4c8c0887f0321)

Conflicts:
libavcodec/mpeg12dec.c

libavcodec/mpeg12.c

index 9d2743a..4021996 100644 (file)
@@ -1266,7 +1266,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 ||
+        (s1->save_progressive_seq != s->progressive_sequence && (s->height&31)) ||
         0)
     {