git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7dee9c2
)
mpeg12dec: avoid reinitializtation on PS changes when possible.
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Jul 2013 19:46:20 +0000
(21:46 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Jul 2013 19:55:04 +0000
(21:55 +0200)
Fixes Ticket2574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12dec.c
b/libavcodec/mpeg12dec.c
index
c686151
..
447057a
100644
(file)
--- a/
libavcodec/mpeg12dec.c
+++ b/
libavcodec/mpeg12dec.c
@@
-1172,7
+1172,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)
{