diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2011-01-14 21:36:45 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2011-01-14 21:36:45 +0000 |
| commit | 0d1d01cf7067235adf314da0a3a339f573ba8ccc (patch) | |
| tree | 4d2361101b101091be146e30bc443475bf20f13a /libavcodec/h264.c | |
| parent | 5657d14094e0b9d3f277322e49442592973bbdac (diff) | |
| download | ffmpeg-0d1d01cf7067235adf314da0a3a339f573ba8ccc.tar.gz | |
Reindent after r26337.
Originally committed as revision 26338 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 a819ee80a2..bd13e1d847 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1204,17 +1204,17 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ }else{ h->hpc.pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); if(h->non_zero_count_cache[ scan8[LUMA_DC_BLOCK_INDEX] ]){ - if(is_h264){ - if(!transform_bypass) - h->h264dsp.h264_luma_dc_dequant_idct(h->mb, h->mb_luma_dc, h->dequant4_coeff[0][s->qscale][0]); - else{ - static const uint8_t dc_mapping[16] = { 0*16, 1*16, 4*16, 5*16, 2*16, 3*16, 6*16, 7*16, - 8*16, 9*16,12*16,13*16,10*16,11*16,14*16,15*16}; - for(i = 0; i < 16; i++) - h->mb[dc_mapping[i]] = h->mb_luma_dc[i]; - } - }else - ff_svq3_luma_dc_dequant_idct_c(h->mb, h->mb_luma_dc, s->qscale); + if(is_h264){ + if(!transform_bypass) + h->h264dsp.h264_luma_dc_dequant_idct(h->mb, h->mb_luma_dc, h->dequant4_coeff[0][s->qscale][0]); + else{ + static const uint8_t dc_mapping[16] = { 0*16, 1*16, 4*16, 5*16, 2*16, 3*16, 6*16, 7*16, + 8*16, 9*16,12*16,13*16,10*16,11*16,14*16,15*16}; + for(i = 0; i < 16; i++) + h->mb[dc_mapping[i]] = h->mb_luma_dc[i]; + } + }else + ff_svq3_luma_dc_dequant_idct_c(h->mb, h->mb_luma_dc, s->qscale); } } if(h->deblocking_filter) |