From 0cc64d3d1c9d95e0549b2c1baac59ab576837abb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 1 Aug 2005 20:01:41 +0000 Subject: [PATCH] fix assertion failure for mpeg2 encoding Originally committed as revision 4488 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/motion_est.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 89d973d285..d860274f8a 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1891,7 +1891,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) { if(s->me_method>=ME_EPZS){ int score[8]; - int i, y, range= s->avctx->me_range; + int i, y, range= s->avctx->me_range ? s->avctx->me_range : (INT_MAX/2); uint8_t * fcode_tab= s->fcode_tab; int best_fcode=-1; int best_score=-10000000; @@ -1914,11 +1914,9 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) fcode_tab[my + MAX_MV]); int j; - if(range){ if(mx >= range || mx < -range || my >= range || my < -range) continue; - } for(j=0; jpict_type==B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])