diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 16:40:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 16:40:53 +0100 |
| commit | 8328df74f3dc0270ac9b2f0a28651562fa2899b1 (patch) | |
| tree | 4c7ac0d85ee80f49dd2bf9d6b5b0685a31ad15d0 | |
| parent | 56540bb3b5a101cddbce418801da8ae7d67e1638 (diff) | |
| download | ffmpeg-8328df74f3dc0270ac9b2f0a28651562fa2899b1.tar.gz | |
motion_est: use av_assert* instead of assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 4d08a14d5b..a303d379b1 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -113,7 +113,7 @@ static av_always_inline int cmp_direct_inline(MpegEncContext *s, const int x, co uint8_t * const * const src= c->src[src_index]; int d; //FIXME check chroma 4mv, (no crashes ...) - assert(x >= c->xmin && hx <= c->xmax<<(qpel+1) && y >= c->ymin && hy <= c->ymax<<(qpel+1)); + av_assert2(x >= c->xmin && hx <= c->xmax<<(qpel+1) && y >= c->ymin && hy <= c->ymax<<(qpel+1)); if(x >= c->xmin && hx <= c->xmax<<(qpel+1) && y >= c->ymin && hy <= c->ymax<<(qpel+1)){ const int time_pp= s->pp_time; const int time_pb= s->pb_time; @@ -392,7 +392,7 @@ static int sad_hpel_motion_search(MpegEncContext * s, const int flags= c->sub_flags; LOAD_COMMON - assert(flags == 0); + av_assert2(flags == 0); if(c->skip){ *mx_ptr = 0; @@ -1593,7 +1593,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y) if(s->mv_type == MV_TYPE_16X16) break; } - assert(xmax <= 15 && ymax <= 15 && xmin >= -16 && ymin >= -16); + av_assert2(xmax <= 15 && ymax <= 15 && xmin >= -16 && ymin >= -16); if(xmax < 0 || xmin >0 || ymax < 0 || ymin > 0){ s->b_direct_mv_table[mot_xy][0]= 0; |