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
This commit is contained in:
Michael Niedermayer 2013-07-08 21:46:20 +02:00 committed by Carl Eugen Hoyos
parent e452e4ca5c
commit c9f34c8260

View File

@ -1251,7 +1251,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)
{