Revision fb2734c8 libavcodec/h264_cabac.c

View differences:

libavcodec/h264_cabac.c
1171 1171

  
1172 1172
static av_always_inline void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int max_coeff ) {
1173 1173
    /* read coded block flag */
1174
    if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 1 ) ] ) == 0 ) {
1174
    if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 1 ) ] ) == 0 ) {
1175 1175
        h->non_zero_count_cache[scan8[n]] = 0;
1176 1176
        return;
1177 1177
    }
......
1180 1180

  
1181 1181
static av_always_inline void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
1182 1182
    /* read coded block flag */
1183
    if( cat != 5 && get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 0 ) ] ) == 0 ) {
1183
    if( cat != 5 && get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 0 ) ] ) == 0 ) {
1184 1184
        h->non_zero_count_cache[scan8[n]] = 0;
1185 1185
        return;
1186 1186
    }

Also available in: Unified diff