# HG changeset patch # User michael # Date 1229569004 0 # Node ID 63f491ce374b4f1832b4116a96dd45f2953dcd9a # Parent e1b2422249704a5411c44167ffc625c880a54b9f indent diff -r e1b242224970 -r 63f491ce374b h264.c --- a/h264.c Thu Dec 18 02:53:18 2008 +0000 +++ b/h264.c Thu Dec 18 02:56:44 2008 +0000 @@ -2517,25 +2517,25 @@ if(IS_INTRA16x16(mb_type)){ if(transform_bypass){ if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){ - h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize); - }else{ - for(i=0; i<16; i++){ - if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]) - idct_add (dest_y + block_offset[i], h->mb + i*16, linesize); - } + h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize); + }else{ + for(i=0; i<16; i++){ + if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]) + idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); + } } }else{ s->dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); } }else if(h->cbp&15){ if(transform_bypass){ - const int di = IS_8x8DCT(mb_type) ? 4 : 1; - for(i=0; i<16; i+=di){ - int nnz = h->non_zero_count_cache[ scan8[i] ]; - if(nnz){ + const int di = IS_8x8DCT(mb_type) ? 4 : 1; + for(i=0; i<16; i+=di){ + int nnz = h->non_zero_count_cache[ scan8[i] ]; + if(nnz){ idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); + } } - } }else{ if(IS_8x8DCT(mb_type)){ s->dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);