diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-11-29 03:32:30 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-11-29 03:32:30 +0000 |
commit | 87f68060691cb48a82faa993eeebe63621ef621c (patch) | |
tree | d5835e451b1dbb2941f27e819e7124ea4aeb98fc /libavcodec/mpeg12.c | |
parent | d9b99556bfa9388d3d61b92dd22853e05a1ea428 (diff) | |
download | ffmpeg-streaming-87f68060691cb48a82faa993eeebe63621ef621c.zip ffmpeg-streaming-87f68060691cb48a82faa993eeebe63621ef621c.tar.gz |
Override a few values read so as to ensure that things are not inconsistent.
Originally committed as revision 20654 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 7e2d1ba..d7e5f41 100644 --- 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; |