1. ffmpeg
  2. Commit 6cb33e076323c684e91abe71d9b3fabe6830c75d
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 @ 6cb33e0
... ... 
@@ -1266,7 +1266,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
1266 1266 
         s1->save_width           != s->width                ||
1267 1267 
         s1->save_height          != s->height               ||
1268 1268 
         s1->save_aspect_info     != s->aspect_ratio_info    ||
1269 
-        s1->save_progressive_seq != s->progressive_sequence ||
1269 
+        (s1->save_progressive_seq != s->progressive_sequence && (s->height&31)) ||
1270 1270 
         0)
1271 1271 
     {
1272 1272