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:55:55 +0200 |
| commit | d0a225d6c1a7eb44852e6671d1e699806afdc376 (patch) | |
| tree | b2b9fa3acb70efa5648635b3ca5c0e631047eea2 | |
| parent | d6641c0bab2199cc9aa2ad2411d7400a3cf61345 (diff) | |
| download | ffmpeg-d0a225d6c1a7eb44852e6671d1e699806afdc376.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 24900d3233..5306d1d87a 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) { |