comparison vc1.c @ 4433:8187c306ffcd libavcodec

Fix BI-frames decoding for Adv. profile

4432:a848b652f0ac

    {
        v->y_ac_table_index = decode012(gb);
    }
    /* DC Syntax */
    v->s.dc_table_index = get_bits(gb, 1);
    if (v->s.pict_type == I_TYPE && v->dquant) {
        av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
        vop_dquant_decoding(v);
    }

    v->bi_type = 0;

            vc1_decode_skip_blocks(v);
        else
            vc1_decode_p_blocks(v);
        break;
    case B_TYPE:
        if(v->bi_type)
            vc1_decode_i_blocks(v);
        else
            vc1_decode_b_blocks(v);
        break;
    }
}

4433:8187c306ffcd

    {
        v->y_ac_table_index = decode012(gb);
    }
    /* DC Syntax */
    v->s.dc_table_index = get_bits(gb, 1);
    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);
    }

    v->bi_type = 0;

            vc1_decode_skip_blocks(v);
        else
            vc1_decode_p_blocks(v);
        break;
    case B_TYPE:
        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;
    }
}