diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-26 16:33:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-26 16:33:17 +0200 |
| commit | 7a4e30f3b6007eaade8706099fb0533b4360d0ea (patch) | |
| tree | 14850d87e3221390c6bcb078128c009bd9ec48d9 /libavcodec/h264_cabac.c | |
| parent | d5d5e3dabe017f0a962766896f9375363edde3a3 (diff) | |
| download | ffmpeg-7a4e30f3b6007eaade8706099fb0533b4360d0ea.tar.gz | |
h264_cabac: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index a409e951f9..1c4288a79b 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -38,14 +38,12 @@ #include "h264data.h" #include "h264_mvpred.h" #include "golomb.h" +#include "libavutil/avassert.h" #if ARCH_X86 #include "x86/h264_i386.h" #endif -//#undef NDEBUG -#include <assert.h> - /* Cabac pre state table */ static const int8_t cabac_context_init_I[1024][2] = @@ -1672,7 +1670,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, } #endif } - assert(coeff_count > 0); + av_assert2(coeff_count > 0); if( is_dc ) { if( cat == 3 ) @@ -1684,7 +1682,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, if( max_coeff == 64 ) fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); else { - assert( cat == 1 || cat == 2 || cat == 4 || cat == 7 || cat == 8 || cat == 11 || cat == 12 ); + av_assert2( cat == 1 || cat == 2 || cat == 4 || cat == 7 || cat == 8 || cat == 11 || cat == 12 ); h->non_zero_count_cache[scan8[n]] = coeff_count; } } @@ -1911,7 +1909,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) { if( h->slice_type_nos == AV_PICTURE_TYPE_B ) { int ctx = 0; - assert(h->slice_type_nos == AV_PICTURE_TYPE_B); + av_assert2(h->slice_type_nos == AV_PICTURE_TYPE_B); if( !IS_DIRECT( h->left_type[LTOP]-1 ) ) ctx++; @@ -1964,7 +1962,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) { mb_type= decode_cabac_intra_mb_type(h, 3, 1); if(h->slice_type == AV_PICTURE_TYPE_SI && mb_type) mb_type--; - assert(h->slice_type_nos == AV_PICTURE_TYPE_I); + av_assert2(h->slice_type_nos == AV_PICTURE_TYPE_I); decode_intra_mb: partition_count = 0; cbp= i_mb_type_info[mb_type].cbp; @@ -2225,7 +2223,7 @@ decode_intra_mb: } } }else{ - assert(IS_8X16(mb_type)); + av_assert2(IS_8X16(mb_type)); for(list=0; list<h->list_count; list++){ for(i=0; i<2; i++){ if(IS_DIR(mb_type, i, list)){ //FIXME optimize |