Commit 87f68060 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent d9b99556
...@@ -1545,6 +1545,13 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) ...@@ -1545,6 +1545,13 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
s->chroma_420_type = get_bits1(&s->gb); s->chroma_420_type = get_bits1(&s->gb);
s->progressive_frame = 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){ if(s->picture_structure == PICT_FRAME){
s->first_field=0; s->first_field=0;
s->v_edge_pos= 16*s->mb_height; s->v_edge_pos= 16*s->mb_height;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment