diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-08 21:46:20 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <[email protected]> | 2013-07-09 00:45:38 +0200 |
| commit | ec268c24a77ecfded355849f79107498e71627db (patch) | |
| tree | 60411a17e462493d271db3b3f287e627a47a7ad4 | |
| parent | 40c521aec0edb47f6d6cd59f96812248e152dfdc (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 29bee1d779..07c5016682 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1263,7 +1263,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) { |