Revision f92a6c66

View differences:

libavcodec/vc1.c
1075 1075
static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb)
1076 1076
{
1077 1077
    VC1Context *v = avctx->priv_data;
1078
    int i, blink, clentry;
1078
    int i;
1079 1079

  
1080 1080
    av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
1081
    blink = get_bits1(gb); // broken link
1082
    clentry = get_bits1(gb); // closed entry
1081
    v->broken_link = get_bits1(gb);
1082
    v->closed_entry = get_bits1(gb);
1083 1083
    v->panscanflag = get_bits1(gb);
1084 1084
    v->refdist_flag = get_bits1(gb);
1085 1085
    v->s.loop_filter = get_bits1(gb);
......
1115 1115
        "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n"
1116 1116
        "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n"
1117 1117
        "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n",
1118
        blink, clentry, v->panscanflag, v->refdist_flag, v->s.loop_filter,
1118
        v->broken_link, v->closed_entry, v->panscanflag, v->refdist_flag, v->s.loop_filter,
1119 1119
        v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode);
1120 1120

  
1121 1121
    return 0;
......
1139 1139

  
1140 1140
    v->bi_type = 0;
1141 1141
    if(v->s.pict_type == FF_B_TYPE) {
1142
        v->bfraction = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
1143
        v->bfraction = ff_vc1_bfraction_lut[v->bfraction];
1142
        v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
1143
        v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index];
1144 1144
        if(v->bfraction == 0) {
1145 1145
            v->s.pict_type = FF_BI_TYPE;
1146 1146
        }
......
1381 1381
        v->uvsamp = get_bits1(gb);
1382 1382
    if(v->finterpflag) v->interpfrm = get_bits1(gb);
1383 1383
    if(v->s.pict_type == FF_B_TYPE) {
1384
        v->bfraction = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
1385
        v->bfraction = ff_vc1_bfraction_lut[v->bfraction];
1384
        v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
1385
        v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index];
1386 1386
        if(v->bfraction == 0) {
1387 1387
            v->s.pict_type = FF_BI_TYPE; /* XXX: should not happen here */
1388 1388
        }
libavcodec/vc1.h
307 307
    int x8_type;
308 308

  
309 309
    uint32_t *cbp_base, *cbp;
310
    uint8_t bfraction_lut_index;///< Index for BFRACTION value (see Table 40, reproduced into ff_vc1_bfraction_lut[])
311
    uint8_t broken_link;        ///< Broken link flag (BROKEN_LINK syntax element)
312
    uint8_t closed_entry;       ///< Closed entry point flag (CLOSED_ENTRY syntax element)
310 313
} VC1Context;
311 314

  
312 315
#endif /* AVCODEC_VC1_H */

Also available in: Unified diff