diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-08 21:46:20 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <[email protected]> | 2013-07-09 00:21:03 +0200 |
| commit | 6cb33e076323c684e91abe71d9b3fabe6830c75d (patch) | |
| tree | 0bd0568c4a566017959f3ad48ef47a7d5b8da8b5 | |
| parent | 2e75c455935d46b205d3f2ebd162874c00bbc08b (diff) | |
mpeg12dec: avoid reinitialization on PS changes when possible.
Fixes Ticket2574
Signed-off-by: Michael Niedermayer <[email protected]>
(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 9d2743a6df..40219960da 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1266,7 +1266,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) { |