Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'

[ffmpeg] / libavcodec / snowenc.c

diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 586dc1d830f52b7ede78bdaa23a8ed58c40fe179..9d4efa4647949d7b6f6ac0307a93f1468e2a95e4 100644 (file)
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -62,10 +62,10 @@ static void find_sse(SnowContext *s, Plane *p, int *score, int score_stride, IDW
             int sx= (x-xo + step/2) / step / Q2_STEP;
             int sy= (y-yo + step/2) / step / Q2_STEP;
             int v= r0[x + y*p->width] - r1[x + y*p->width];
-            assert(sx>=0 && sy>=0 && sx < score_stride);
+            av_assert2(sx>=0 && sy>=0 && sx < score_stride);
             v= ((v+8)>>4)<<4;
             score[sx + sy*score_stride] += v*v;
-            assert(score[sx + sy*score_stride] >= 0);
+            av_assert2(score[sx + sy*score_stride] >= 0);
         }
     }
 }
@@ -963,10 +963,10 @@ static int encode_subband_c0run(SnowContext *s, SubBand *b, const IDWTELEM *src,
 
                         if(run_index <= max_index)
                             put_symbol2(&s->c, b->state[1], run, 3);
-                        assert(v);
+                        av_assert2(v);
                     }else{
                         run--;
-                        assert(!v);
+                        av_assert2(!v);
                     }
                 }
                 if(v){