diff options
author | Alexander Strange <astrange@ithinksw.com> | 2008-07-02 22:12:01 +0000 |
---|---|---|
committer | Alexander Strange <astrange@ithinksw.com> | 2008-07-02 22:12:01 +0000 |
commit | 9f734c3b57a41bc3723b4ae7373f6be1dedcd292 (patch) | |
tree | 0712d55880b98353afe1af4e47ab8d33f627997a | |
parent | 9588ec340c3f33c7474b4cd2893046cfdaee42bf (diff) | |
download | ffmpeg-9f734c3b57a41bc3723b4ae7373f6be1dedcd292.tar.gz |
Reindent.
Originally committed as revision 14051 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/h264.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4e5e7e7e0a..f4c461f0e6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5342,22 +5342,22 @@ static av_always_inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx, int ctx = 0; if( is_dc ) { - if( cat == 0 ) { - nza = h->left_cbp&0x100; - nzb = h-> top_cbp&0x100; - } else { - nza = (h->left_cbp>>(6+idx))&0x01; - nzb = (h-> top_cbp>>(6+idx))&0x01; - } - } else { - if( cat == 1 || cat == 2 ) { - nza = h->non_zero_count_cache[scan8[idx] - 1]; - nzb = h->non_zero_count_cache[scan8[idx] - 8]; + if( cat == 0 ) { + nza = h->left_cbp&0x100; + nzb = h-> top_cbp&0x100; + } else { + nza = (h->left_cbp>>(6+idx))&0x01; + nzb = (h-> top_cbp>>(6+idx))&0x01; + } } else { - assert(cat == 4); - nza = h->non_zero_count_cache[scan8[16+idx] - 1]; - nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; - } + if( cat == 1 || cat == 2 ) { + nza = h->non_zero_count_cache[scan8[idx] - 1]; + nzb = h->non_zero_count_cache[scan8[idx] - 8]; + } else { + assert(cat == 4); + nza = h->non_zero_count_cache[scan8[16+idx] - 1]; + nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; + } } if( nza > 0 ) @@ -5447,10 +5447,10 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT if( is_dc || cat != 5 ) { if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, is_dc ) ] ) == 0 ) { if( !is_dc ) { - if( cat == 1 || cat == 2 ) - h->non_zero_count_cache[scan8[n]] = 0; - else - h->non_zero_count_cache[scan8[16+n]] = 0; + if( cat == 1 || cat == 2 ) + h->non_zero_count_cache[scan8[n]] = 0; + else + h->non_zero_count_cache[scan8[16+n]] = 0; } #ifdef CABAC_ON_STACK @@ -5499,19 +5499,19 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT assert(coeff_count > 0); if( is_dc ) { - if( cat == 0 ) - h->cbp_table[h->mb_xy] |= 0x100; - else - h->cbp_table[h->mb_xy] |= 0x40 << n; + if( cat == 0 ) + h->cbp_table[h->mb_xy] |= 0x100; + else + h->cbp_table[h->mb_xy] |= 0x40 << n; } else { - if( cat == 1 || cat == 2 ) - h->non_zero_count_cache[scan8[n]] = coeff_count; - else if( cat == 4 ) - h->non_zero_count_cache[scan8[16+n]] = coeff_count; - else { - assert( cat == 5 ); - fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); - } + if( cat == 1 || cat == 2 ) + h->non_zero_count_cache[scan8[n]] = coeff_count; + else if( cat == 4 ) + h->non_zero_count_cache[scan8[16+n]] = coeff_count; + else { + assert( cat == 5 ); + fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); + } } for( coeff_count--; coeff_count >= 0; coeff_count-- ) { |