Commit 725de25c authored by Michael Niedermayer's avatar Michael Niedermayer

fix segfault with 'ffmpeg -i 1.avi -cmp 257 -4mv 2.avi'

Originally committed as revision 4178 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5fddb9b3
......@@ -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]){
......
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