diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 21:46:20 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-09 00:48:42 +0200 |
| commit | c9f34c82604aa4f24f178172a3886a187b6bbd07 (patch) | |
| tree | c60700d63bc9bc5a65d9197d08e7cc167ac3da5e | |
| parent | e452e4ca5cdb3497e32249fd9a232bc636cbeb55 (diff) | |
| download | ffmpeg-c9f34c82604aa4f24f178172a3886a187b6bbd07.tar.gz | |
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
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 697eebb091..bcee1d8290 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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) { |