[SCM] libav/experimental: Fix BI-frames decoding for Adv. profile

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b024824bed68de5c1c5162c042e2607e0d37ab57
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Mon Jan 29 14:23:00 2007 +0000

    Fix BI-frames decoding for Adv. profile
    
    Originally committed as revision 7758 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 40b79b3..5649484 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1834,7 +1834,7 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
     }
     /* DC Syntax */
     v->s.dc_table_index = get_bits(gb, 1);
-    if (v->s.pict_type == I_TYPE && v->dquant) {
+    if ((v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) && v->dquant) {
         av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
         vop_dquant_decoding(v);
     }
@@ -4083,9 +4083,12 @@ static void vc1_decode_blocks(VC1Context *v)
             vc1_decode_p_blocks(v);
         break;
     case B_TYPE:
-        if(v->bi_type)
-            vc1_decode_i_blocks(v);
-        else
+        if(v->bi_type){
+            if(v->profile == PROFILE_ADVANCED)
+                vc1_decode_i_blocks_adv(v);
+            else
+                vc1_decode_i_blocks(v);
+        }else
             vc1_decode_b_blocks(v);
         break;
     }

-- 
Libav/FFmpeg packaging