Revision 4bbdf13f

View differences:

libavcodec/h264.c
5222 5222

  
5223 5223
        if(cbp&0x20){
5224 5224
            for(chroma_idx=0; chroma_idx<2; chroma_idx++){
5225
                const uint32_t *qmul = h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][chroma_qp];
5225 5226
                for(i4x4=0; i4x4<4; i4x4++){
5226 5227
                    const int index= 16 + 4*chroma_idx + i4x4;
5227
                    if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][chroma_qp], 15) < 0){
5228
                    if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){
5228 5229
                        return -1;
5229 5230
                    }
5230 5231
                }
......
6341 6342
        if( cbp&0x20 ) {
6342 6343
            int c, i;
6343 6344
            for( c = 0; c < 2; c++ ) {
6345
                const uint32_t *qmul = h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp];
6344 6346
                for( i = 0; i < 4; i++ ) {
6345 6347
                    const int index = 16 + 4 * c + i;
6346 6348
                    //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
6347
                    if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp], 15) < 0)
6349
                    if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, qmul, 15) < 0)
6348 6350
                        return -1;
6349 6351
                }
6350 6352
            }

Also available in: Unified diff