1. ffmpeg
  2. Commit f75964ad1fe7142fe402cbcb75db7d31d73a00e6
Browse code

mpeg12dec: avoid reinitialization on PS changes when possible.

Fixes Ticket2574

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

Conflicts:
libavcodec/mpeg12dec.c

Michael Niedermayer authored on 2013/07/09 04:46:20
Showing 1 changed files
libavcodec/mpeg12.c
History View file @ f75964a
... ... 
@@ -1250,7 +1250,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
1250 1250 
         s1->save_width           != s->width                ||
1251 1251 
         s1->save_height          != s->height               ||
1252 1252 
         s1->save_aspect_info     != s->aspect_ratio_info    ||
1253 
-        s1->save_progressive_seq != s->progressive_sequence ||
1253 
+        (s1->save_progressive_seq != s->progressive_sequence && (s->height&31)) ||
1254 1254 
         0)
1255 1255 
     {
1256 1256