diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-15 21:39:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-15 21:39:53 +0200 |
commit | 717a1876d8720386fe02d07db319ee73e46ac67e (patch) | |
tree | f658cbeda88ba7d371460ad81bb2de3aacc9f1e9 /libavcodec/motion_est.c | |
parent | 9e89bc37edfcd1b4b0a22c096c6546df4a9d1c0b (diff) | |
download | ffmpeg-717a1876d8720386fe02d07db319ee73e46ac67e.tar.gz |
motion_est: switch some asserts to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r-- | libavcodec/motion_est.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index d06080345b..5e3db18ace 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1867,12 +1867,12 @@ void ff_fix_long_p_mvs(MpegEncContext * s) MotionEstContext * const c= &s->me; const int f_code= s->f_code; int y, range; - assert(s->pict_type==AV_PICTURE_TYPE_P); + av_assert0(s->pict_type==AV_PICTURE_TYPE_P); range = (((s->out_format == FMT_MPEG1 || s->msmpeg4_version) ? 8 : 16) << f_code); - assert(range <= 16 || !s->msmpeg4_version); - assert(range <=256 || !(s->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->avctx->strict_std_compliance >= FF_COMPLIANCE_NORMAL)); + av_assert0(range <= 16 || !s->msmpeg4_version); + av_assert0(range <=256 || !(s->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->avctx->strict_std_compliance >= FF_COMPLIANCE_NORMAL)); if(c->avctx->me_range && range > c->avctx->me_range) range= c->avctx->me_range; |