fix segfault with 'ffmpeg -i 1.avi -cmp 257 -4mv 2.avi'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 May 2005 13:40:28 +0000 (13:40 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 May 2005 13:40:28 +0000 (13:40 +0000)
Originally committed as revision 4178 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/motion_est.c

index 8fbbdf5..f49eda1 100644 (file)
@@ -269,7 +269,7 @@ void ff_init_me(MpegEncContext *s){
 
     // 8x8 fullpel search would need a 4x4 chroma compare, which we dont have yet, and even if we had the motion estimation code doesnt expect it
     if(s->codec_id != CODEC_ID_SNOW){
-        if((c->avctx->me_cmp&FF_CMP_CHROMA) && !s->dsp.me_cmp[2]){
+        if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){
             s->dsp.me_cmp[2]= zero_cmp;
         }
         if((c->avctx->me_sub_cmp&FF_CMP_CHROMA) && !s->dsp.me_sub_cmp[2]){