OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d9b9955
)
Override a few values read so as to ensure that things are not inconsistent.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 29 Nov 2009 03:32:30 +0000
(
03:32
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 29 Nov 2009 03:32:30 +0000
(
03:32
+0000)
Originally committed as revision 20654 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpeg12.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12.c
b/libavcodec/mpeg12.c
index
7e2d1ba
..
d7e5f41
100644
(file)
--- a/
libavcodec/mpeg12.c
+++ b/
libavcodec/mpeg12.c
@@
-1545,6
+1545,13
@@
static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
s->chroma_420_type = get_bits1(&s->gb);
s->progressive_frame = get_bits1(&s->gb);
+ if(s->progressive_sequence)
+ s->progressive_frame= 1;
+ if(s->progressive_frame){
+ s->picture_structure= PICT_FRAME;
+ s->frame_pred_frame_dct= 1;
+ }
+
if(s->picture_structure == PICT_FRAME){
s->first_field=0;
s->v_edge_pos= 16*s->mb_height;