Revision 59b5370f libavcodec/h264.h

View differences:

libavcodec/h264.h
947 947
        // top_cbp
948 948
        if(top_type) {
949 949
            h->top_cbp = h->cbp_table[top_xy];
950
        } else if(IS_INTRA(mb_type)) {
951
            h->top_cbp = 0x1CF;
952 950
        } else {
953
            h->top_cbp = 0x00F;
951
            h->top_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F;
954 952
        }
955 953
        // left_cbp
956 954
        if (left_type[0]) {
957 955
            h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0;
958
        } else if(IS_INTRA(mb_type)) {
959
            h->left_cbp = 0x1CF;
960
        } else {
961
            h->left_cbp = 0x00F;
962
        }
963
        if (left_type[0]) {
964 956
            h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1;
965
        }
966
        if (left_type[1]) {
967 957
            h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3;
958
        } else {
959
            h->left_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F;
968 960
        }
969 961
    }
970 962
    }

Also available in: Unified diff