Revision 65344775

View differences:

libavcodec/h264.c
289 289
#undef xStride
290 290
#undef stride
291 291

  
292
static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
292
static void chroma_dc_dequant_idct_c(DCTELEM *block, int qmul){
293 293
    const int stride= 16*2;
294 294
    const int xStride= 16;
295 295
    int a,b,c,d,e;
......
1285 1285
            }else{
1286 1286
                if(is_h264){
1287 1287
                    if(h->non_zero_count_cache[ scan8[CHROMA_DC_BLOCK_INDEX+0] ])
1288
                        chroma_dc_dequant_idct_c(h->mb + 16*16     , h->chroma_qp[0], h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
1288
                        chroma_dc_dequant_idct_c(h->mb + 16*16     , h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
1289 1289
                    if(h->non_zero_count_cache[ scan8[CHROMA_DC_BLOCK_INDEX+1] ])
1290
                        chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
1290
                        chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
1291 1291
                    h->h264dsp.h264_idct_add8(dest, block_offset,
1292 1292
                                              h->mb, uvlinesize,
1293 1293
                                              h->non_zero_count_cache);
1294 1294
                }else{
1295
                    chroma_dc_dequant_idct_c(h->mb + 16*16     , h->chroma_qp[0], h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
1296
                    chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
1295
                    chroma_dc_dequant_idct_c(h->mb + 16*16     , h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
1296
                    chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
1297 1297
                    for(i=16; i<16+8; i++){
1298 1298
                        if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
1299 1299
                            uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];

Also available in: Unified diff