Revision ce5e49b0 libavcodec/wmv2dec.c

View differences:

libavcodec/wmv2dec.c
120 120
        decode_ext_header(w);
121 121

  
122 122
    s->pict_type = get_bits1(&s->gb) + 1;
123
    if(s->pict_type == FF_I_TYPE){
123
    if(s->pict_type == AV_PICTURE_TYPE_I){
124 124
        code = get_bits(&s->gb, 7);
125 125
        av_log(s->avctx, AV_LOG_DEBUG, "I7:%X/\n", code);
126 126
    }
......
135 135
{
136 136
    Wmv2Context * const w= (Wmv2Context*)s;
137 137

  
138
    if (s->pict_type == FF_I_TYPE) {
138
    if (s->pict_type == AV_PICTURE_TYPE_I) {
139 139
        if(w->j_type_bit) w->j_type= get_bits1(&s->gb);
140 140
        else              w->j_type= 0; //FIXME check
141 141

  
......
342 342

  
343 343
    if(w->j_type) return 0;
344 344

  
345
    if (s->pict_type == FF_P_TYPE) {
345
    if (s->pict_type == AV_PICTURE_TYPE_P) {
346 346
        if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])){
347 347
            /* skip mb */
348 348
            s->mb_intra = 0;
......
419 419
            }
420 420
        }
421 421
    } else {
422
//if(s->pict_type==FF_P_TYPE)
422
//if(s->pict_type==AV_PICTURE_TYPE_P)
423 423
//   printf("%d%d ", s->inter_intra_pred, cbp);
424 424
//printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24));
425 425
        s->ac_pred = get_bits1(&s->gb);

Also available in: Unified diff