aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-08 21:46:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-08 21:55:04 +0200
commit970c8df73528659925819dec31c4c8c0887f0321 (patch)
tree7e39fb1a94e93a04f232ab10848045c705c93695
parent7dee9c22686fab4539328eb433f7e7af50217439 (diff)
downloadffmpeg-970c8df73528659925819dec31c4c8c0887f0321.tar.gz
mpeg12dec: avoid reinitializtation on PS changes when possible.
Fixes Ticket2574 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpeg12dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index c6861519de..447057af18 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1172,7 +1172,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)
{