diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-16 17:58:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-16 17:58:40 +0200 |
| commit | 3000074495c59fdbac98bfdd3ced22eafab725c6 (patch) | |
| tree | 1d8038b59aa5a7c5fc68735a1cc86565f4b6f7d8 /libavcodec | |
| parent | 809d71d650c345079ac3e34910692a8aea429bc7 (diff) | |
| download | ffmpeg-3000074495c59fdbac98bfdd3ced22eafab725c6.tar.gz | |
mpegvideo_common.h: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_common.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h index 2ef83abb8f..131a805223 100644 --- a/libavcodec/mpegvideo_common.h +++ b/libavcodec/mpegvideo_common.h @@ -31,6 +31,7 @@ #define AVCODEC_MPEGVIDEO_COMMON_H #include <string.h> +#include "libavutil/avassert.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -439,7 +440,7 @@ static inline void obmc_motion(MpegEncContext *s, int i; uint8_t *ptr[5]; - assert(s->quarter_sample==0); + av_assert2(s->quarter_sample==0); for(i=0; i<5; i++){ if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ @@ -649,7 +650,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s, const int mot_stride= s->b8_stride; const int mot_xy= mb_x*2 + mb_y*2*mot_stride; - assert(!s->mb_skipped); + av_assert2(!s->mb_skipped); memcpy(mv_cache[1][1], s->current_picture.f.motion_val[0][mot_xy ], sizeof(int16_t) * 4); memcpy(mv_cache[2][1], s->current_picture.f.motion_val[0][mot_xy + mot_stride], sizeof(int16_t) * 4); @@ -870,7 +871,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s, } } break; - default: assert(0); + default: av_assert2(0); } } |