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:53:51 +0200 |
| commit | f75964ad1fe7142fe402cbcb75db7d31d73a00e6 (patch) | |
| tree | 3261418b2d4dcedaa1cd89d05db1a934d47c8795 | |
| parent | e445dc9237ae3c87565480936b4feba31f7de998 (diff) | |
| download | ffmpeg-f75964ad1fe7142fe402cbcb75db7d31d73a00e6.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 70daf68789..328d6a079b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1250,7 +1250,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) { |