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 01:01:29 +0200 |
| commit | 82c6b76d701a44941da47fb60ddf13d94769b91e (patch) | |
| tree | 18c2a394ae0324d6323c4e31e80b06166df5266e | |
| parent | dc61d44842699f95e8387144c6046170d1f90d62 (diff) | |
| download | ffmpeg-82c6b76d701a44941da47fb60ddf13d94769b91e.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
| -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 112d8fe8cd..ab6baa9bb6 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) { |