Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:26:30 +0000 (04:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:29:59 +0000 (04:29 +0100)
* qatar/master:
  vc1: Always reset numref when parsing a new frame header.

Conflicts:
libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vc1.c

@@@ -837,11 -842,9 +837,11 @@@ int ff_vc1_parse_frame_header_adv(VC1Co
      int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */
      int field_mode, fcm;
  
-     v->numref=0;
+     v->numref          = 0;
      v->p_frame_skipped = 0;
      if (v->second_field) {
 +        if(v->fcm!=2 || v->field_mode!=1)
 +            return -1;
          v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
          if (v->fptype & 4)
              v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_BI : AV_PICTURE_TYPE_B;