[FFmpeg-cvslog] motion_est: switch some asserts to av_assert
Michael Niedermayer
git at videolan.org
Wed Aug 15 21:44:49 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 15 21:39:53 2012 +0200| [717a1876d8720386fe02d07db319ee73e46ac67e] | committer: Michael Niedermayer
motion_est: switch some asserts to av_assert
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=717a1876d8720386fe02d07db319ee73e46ac67e
---
libavcodec/motion_est.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index d060803..5e3db18 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;
More information about the ffmpeg-cvslog
mailing list