[FFmpeg-cvslog] r20654 - trunk/libavcodec/mpeg12.c

[michael]

Author: michael
Date: Sun Nov 29 04:32:30 2009
New Revision: 20654

Log:
Override a few values read so as to ensure that things are not inconsistent.

Modified:
   trunk/libavcodec/mpeg12.c

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	Sun Nov 29 04:05:11 2009	(r20653)
+++ trunk/libavcodec/mpeg12.c	Sun Nov 29 04:32:30 2009	(r20654)
@@ -1545,6 +1545,13 @@ static void mpeg_decode_picture_coding_e
     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;