X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Finteger.c;h=5bcde0dc6e676ab7a647f798a9b0987646b0b65b;hb=0114c571d4c8cc1036850ced924683709390681a;hp=4f9b66cbc8e0aa90fdbb700f79e27a952c2a9e64;hpb=a1fc1d2e1b4a5bcfd07549dce9735f24237aa32e;p=ffmpeg

diff --git a/libavutil/integer.c b/libavutil/integer.c
index 4f9b66cbc8e..5bcde0dc6e6 100644
--- a/libavutil/integer.c
+++ b/libavutil/integer.c
@@ -27,6 +27,7 @@
 
 #include "common.h"
 #include "integer.h"
+#include "avassert.h"
 
 AVInteger av_add_i(AVInteger a, AVInteger b){
     int i, carry=0;
@@ -110,8 +111,8 @@ AVInteger av_mod_i(AVInteger *quot, AVInteger a, AVInteger b){
     AVInteger quot_temp;
     if(!quot) quot = &quot_temp;
 
-    assert((int16_t)a[AV_INTEGER_SIZE-1] >= 0 && (int16_t)b[AV_INTEGER_SIZE-1] >= 0);
-    assert(av_log2(b)>=0);
+    av_assert2((int16_t)a.v[AV_INTEGER_SIZE-1] >= 0 && (int16_t)b.v[AV_INTEGER_SIZE-1] >= 0);
+    av_assert2(av_log2_i(b)>=0);
 
     if(i > 0)
         b= av_shr_i(b, -i);
@@ -157,8 +158,6 @@ int64_t av_i2int(AVInteger a){
 }
 
 #ifdef TEST
-#undef NDEBUG
-#include <assert.h>
 
 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,
@@ -179,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;