Commit 8328df74 authored by Michael Niedermayer's avatar Michael Niedermayer

motion_est: use av_assert* instead of assert

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 56540bb3
...@@ -113,7 +113,7 @@ static av_always_inline int cmp_direct_inline(MpegEncContext *s, const int x, co ...@@ -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]; uint8_t * const * const src= c->src[src_index];
int d; int d;
//FIXME check chroma 4mv, (no crashes ...) //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)){ 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_pp= s->pp_time;
const int time_pb= s->pb_time; const int time_pb= s->pb_time;
...@@ -392,7 +392,7 @@ static int sad_hpel_motion_search(MpegEncContext * s, ...@@ -392,7 +392,7 @@ static int sad_hpel_motion_search(MpegEncContext * s,
const int flags= c->sub_flags; const int flags= c->sub_flags;
LOAD_COMMON LOAD_COMMON
assert(flags == 0); av_assert2(flags == 0);
if(c->skip){ if(c->skip){
*mx_ptr = 0; *mx_ptr = 0;
...@@ -1593,7 +1593,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y) ...@@ -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; 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){ if(xmax < 0 || xmin >0 || ymax < 0 || ymin > 0){
s->b_direct_mv_table[mot_xy][0]= 0; s->b_direct_mv_table[mot_xy][0]= 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment