Revision ce5e49b0 libavcodec/ituh263dec.c

View differences:

libavcodec/ituh263dec.c
347 347
        s->block_index[i]+= 1;
348 348
    s->mb_x++;
349 349

  
350
    assert(s->pict_type == FF_P_TYPE);
350
    assert(s->pict_type == AV_PICTURE_TYPE_P);
351 351

  
352 352
    do{
353 353
        if (get_bits1(&s->gb)) {
......
460 460
        /* DC coef */
461 461
        if(s->codec_id == CODEC_ID_RV10){
462 462
#if CONFIG_RV10_DECODER
463
          if (s->rv10_version == 3 && s->pict_type == FF_I_TYPE) {
463
          if (s->rv10_version == 3 && s->pict_type == AV_PICTURE_TYPE_I) {
464 464
            int component, diff;
465 465
            component = (n <= 3 ? 0 : n - 4 + 1);
466 466
            level = s->last_dc[component];
......
608 608

  
609 609
    assert(!s->h263_pred);
610 610

  
611
    if (s->pict_type == FF_P_TYPE) {
611
    if (s->pict_type == AV_PICTURE_TYPE_P) {
612 612
        do{
613 613
            if (get_bits1(&s->gb)) {
614 614
                /* skip mb */
......
700 700
                mot_val[1] = my;
701 701
            }
702 702
        }
703
    } else if(s->pict_type==FF_B_TYPE) {
703
    } else if(s->pict_type==AV_PICTURE_TYPE_B) {
704 704
        int mb_type;
705 705
        const int stride= s->b8_stride;
706 706
        int16_t *mot_val0 = s->current_picture.motion_val[0][ 2*(s->mb_x + s->mb_y*stride) ];
......
843 843
    if(s->pb_frame && h263_skip_b_part(s, cbpb) < 0)
844 844
        return -1;
845 845
    if(s->obmc && !s->mb_intra){
846
        if(s->pict_type == FF_P_TYPE && s->mb_x+1<s->mb_width && s->mb_num_left != 1)
846
        if(s->pict_type == AV_PICTURE_TYPE_P && s->mb_x+1<s->mb_width && s->mb_num_left != 1)
847 847
            preview_obmc(s);
848 848
    }
849 849
end:
......
921 921
        if (!width)
922 922
            return -1;
923 923

  
924
        s->pict_type = FF_I_TYPE + get_bits1(&s->gb);
924
        s->pict_type = AV_PICTURE_TYPE_I + get_bits1(&s->gb);
925 925

  
926 926
        s->h263_long_vectors = get_bits1(&s->gb);
927 927

  
......
985 985
        /* MPPTYPE */
986 986
        s->pict_type = get_bits(&s->gb, 3);
987 987
        switch(s->pict_type){
988
        case 0: s->pict_type= FF_I_TYPE;break;
989
        case 1: s->pict_type= FF_P_TYPE;break;
990
        case 2: s->pict_type= FF_P_TYPE;s->pb_frame = 3;break;
991
        case 3: s->pict_type= FF_B_TYPE;break;
992
        case 7: s->pict_type= FF_I_TYPE;break; //ZYGO
988
        case 0: s->pict_type= AV_PICTURE_TYPE_I;break;
989
        case 1: s->pict_type= AV_PICTURE_TYPE_P;break;
990
        case 2: s->pict_type= AV_PICTURE_TYPE_P;s->pb_frame = 3;break;
991
        case 3: s->pict_type= AV_PICTURE_TYPE_B;break;
992
        case 7: s->pict_type= AV_PICTURE_TYPE_I;break; //ZYGO
993 993
        default:
994 994
            return -1;
995 995
        }
......
1112 1112
    }
1113 1113

  
1114 1114
        ff_h263_show_pict_info(s);
1115
    if (s->pict_type == FF_I_TYPE && s->codec_tag == AV_RL32("ZYGO")){
1115
    if (s->pict_type == AV_PICTURE_TYPE_I && s->codec_tag == AV_RL32("ZYGO")){
1116 1116
        int i,j;
1117 1117
        for(i=0; i<85; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb));
1118 1118
        av_log(s->avctx, AV_LOG_DEBUG, "\n");

Also available in: Unified diff