Mercurial > libavcodec.hg

changeset 2816:c6ab4b91a5c5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix assertion failure for mpeg2 encoding
author michael
date Mon, 01 Aug 2005 20:01:41 +0000
parents 636133fccbdc
children b128802eb77b
files motion_est.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/motion_est.c	Mon Aug 01 14:47:07 2005 +0000
+++ b/motion_est.c	Mon Aug 01 20:01:41 2005 +0000
@@ -1891,7 +1891,7 @@
 {
     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 @@
                                      fcode_tab[my + MAX_MV]);
                     int j;
                     
-                    if(range){
                         if(mx >= range || mx < -range || 
                            my >= range || my < -range)
                             continue;
-                    }
                     
                     for(j=0; j<fcode && j<8; j++){
                         if(s->pict_type==B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])