Commit db01f7b4 authored by kostya's avatar kostya

Fix BI-frames decoding for Adv. profile

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7758 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 0f6bf84b
...@@ -1834,7 +1834,7 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) ...@@ -1834,7 +1834,7 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
} }
/* DC Syntax */ /* DC Syntax */
v->s.dc_table_index = get_bits(gb, 1); 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"); av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
vop_dquant_decoding(v); vop_dquant_decoding(v);
} }
...@@ -4083,9 +4083,12 @@ static void vc1_decode_blocks(VC1Context *v) ...@@ -4083,9 +4083,12 @@ static void vc1_decode_blocks(VC1Context *v)
vc1_decode_p_blocks(v); vc1_decode_p_blocks(v);
break; break;
case B_TYPE: case B_TYPE:
if(v->bi_type) if(v->bi_type){
vc1_decode_i_blocks(v); if(v->profile == PROFILE_ADVANCED)
vc1_decode_i_blocks_adv(v);
else else
vc1_decode_i_blocks(v);
}else
vc1_decode_b_blocks(v); vc1_decode_b_blocks(v);
break; break;
} }
......
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