changeset 8794:1f98fc269920 libavcodec

fix parsing of pic_structure
author stefang
date Tue, 10 Feb 2009 17:08:56 +0000
parents d46cde168c69
children e18df4791658
files cavsdec.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/cavsdec.c	Tue Feb 10 16:45:02 2009 +0000
+++ b/cavsdec.c	Tue Feb 10 17:08:56 2009 +0000
@@ -499,9 +499,10 @@
     if(s->low_delay)
         get_ue_golomb(&s->gb); //bbv_check_times
     h->progressive             = get_bits1(&s->gb);
-    if(h->progressive)
-        h->pic_structure = 1;
-    else if(!(h->pic_structure = get_bits1(&s->gb) && (h->stc == PIC_PB_START_CODE)) )
+    h->pic_structure = 1;
+    if(!h->progressive)
+        h->pic_structure = get_bits1(&s->gb);
+    if(!h->pic_structure && h->stc == PIC_PB_START_CODE)
         skip_bits1(&s->gb);     //advanced_pred_mode_disable
     skip_bits1(&s->gb);        //top_field_first
     skip_bits1(&s->gb);        //repeat_first_field