[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec motion_est.c,1.104,1.105

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv23746

Modified Files:
	motion_est.c 
Log Message:
fix segfault with 'ffmpeg -i 1.avi -cmp 257 -4mv 2.avi'


Index: motion_est.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/motion_est.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- motion_est.c	24 Apr 2005 17:21:09 -0000	1.104
+++ motion_est.c	5 May 2005 13:40:28 -0000	1.105
@@ -269,7 +269,7 @@
 
     // 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]){