diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-18 02:56:44 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-18 02:56:44 +0000 |
| commit | 0a8ca22f4e5ef3fddf75f4e85158d8d0d85f98bf (patch) | |
| tree | 65a54e590145cffcb62623588bdbff1590303d09 /libavcodec/h264.c | |
| parent | 2fd1f0e0262da82d05517c8c104dcd9a2007fa0d (diff) | |
indent
Originally committed as revision 16208 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d15845bc2f..bc87701f7a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2517,25 +2517,25 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ 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); |