Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'

[ffmpeg] / libavcodec / dsputil_template.c

diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c
index 72867264108c989c5a6f6e06e24f5bf80d5aab1e..0d6e8df313d86234c4cb684ff74cb3845033a8d1 100644 (file)
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@@ -680,7 +680,7 @@ static void FUNCC(OPNAME ## h264_chroma_mc2)(uint8_t *p_dst/*align 8*/, uint8_t
     int i;\
     stride >>= sizeof(pixel)-1;\
     \
-    assert(x<8 && y<8 && x>=0 && y>=0);\
+    av_assert2(x<8 && y<8 && x>=0 && y>=0);\
 \
     if(D){\
         for(i=0; i<h; i++){\