diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 20:51:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 20:51:07 +0200 |
| commit | 3422e7c39506dd2c24c188c86acc61cdc4da99be (patch) | |
| tree | 5b0c5a8a552e32b6d29a1fb0bf583f3bfcddc0f0 /libavcodec | |
| parent | 107b42388cc5481f599fd71d4f4edbd6360c2ad5 (diff) | |
| download | ffmpeg-3422e7c39506dd2c24c188c86acc61cdc4da99be.tar.gz | |
lavc/rectangle: change assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rectangle.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h index cf4a9ccec3..43f89c9e0f 100644 --- a/libavcodec/rectangle.h +++ b/libavcodec/rectangle.h @@ -28,9 +28,9 @@ #ifndef AVCODEC_RECTANGLE_H #define AVCODEC_RECTANGLE_H -#include <assert.h> #include "config.h" #include "libavutil/common.h" +#include "libavutil/avassert.h" #include "dsputil.h" /** @@ -41,14 +41,14 @@ */ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ uint8_t *p= (uint8_t*)vp; - assert(size==1 || size==2 || size==4); - assert(w<=4); + av_assert2(size==1 || size==2 || size==4); + av_assert2(w<=4); w *= size; stride *= size; - assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); - assert((stride&(w-1))==0); + av_assert2((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); + av_assert2((stride&(w-1))==0); if(w==2){ const uint16_t v= size==4 ? val : val*0x0101; *(uint16_t*)(p + 0*stride)= v; @@ -118,8 +118,8 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, *(uint32_t*)(p +12+3*stride)= val; #endif }else - assert(0); - assert(h==4); + av_assert2(0); + av_assert2(h==4); } #endif /* AVCODEC_RECTANGLE_H */ |