From: Michael Niedermayer Date: Wed, 8 Aug 2012 23:40:56 +0000 (+0200) Subject: integer: switch to av_assert X-Git-Tag: android-x86-4.4-r1~10169 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f79f25e948af05da81631dcce0768d507033d0f7;p=android-x86%2Fexternal-ffmpeg.git integer: switch to av_assert Signed-off-by: Michael Niedermayer --- diff --git a/libavutil/integer.c b/libavutil/integer.c index 38620b2f2d..5bcde0dc6e 100644 --- a/libavutil/integer.c +++ b/libavutil/integer.c @@ -158,8 +158,6 @@ int64_t av_i2int(AVInteger a){ } #ifdef TEST -#undef NDEBUG -#include const uint8_t ff_log2_tab[256]={ 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, @@ -180,17 +178,17 @@ int main(void){ AVInteger ai= av_int2i(a); AVInteger bi= av_int2i(b); - assert(av_i2int(ai) == a); - assert(av_i2int(bi) == b); - assert(av_i2int(av_add_i(ai,bi)) == a+b); - assert(av_i2int(av_sub_i(ai,bi)) == a-b); - assert(av_i2int(av_mul_i(ai,bi)) == a*b); - assert(av_i2int(av_shr_i(ai, 9)) == a>>9); - assert(av_i2int(av_shr_i(ai,-9)) == a<<9); - assert(av_i2int(av_shr_i(ai, 17)) == a>>17); - assert(av_i2int(av_shr_i(ai,-17)) == a<<17); - assert(av_log2_i(ai) == av_log2(a)); - assert(av_i2int(av_div_i(ai,bi)) == a/b); + av_assert0(av_i2int(ai) == a); + av_assert0(av_i2int(bi) == b); + av_assert0(av_i2int(av_add_i(ai,bi)) == a+b); + av_assert0(av_i2int(av_sub_i(ai,bi)) == a-b); + av_assert0(av_i2int(av_mul_i(ai,bi)) == a*b); + av_assert0(av_i2int(av_shr_i(ai, 9)) == a>>9); + av_assert0(av_i2int(av_shr_i(ai,-9)) == a<<9); + av_assert0(av_i2int(av_shr_i(ai, 17)) == a>>17); + av_assert0(av_i2int(av_shr_i(ai,-17)) == a<<17); + av_assert0(av_log2_i(ai) == av_log2(a)); + av_assert0(av_i2int(av_div_i(ai,bi)) == a/b); } } return 0;