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:59:24 +0200 |
| commit | f8c4dbe45ee2d76340e5b1071d998f6fb15e1aca (patch) | |
| tree | 304735eabd9a3311996865f10295ee99962c2879 /libavcodec | |
| parent | c997dcd38be70568e4133125f8e68a2ef837646e (diff) | |
| download | ffmpeg-f8c4dbe45ee2d76340e5b1071d998f6fb15e1aca.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/mpeg12.c
Diffstat (limited to 'libavcodec')
| -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 671406746b..0cf9aa1843 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1288,7 +1288,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) { |