From fd42eb6dec2d911a8480d7b30625b27aeb34ce6c Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Fri, 6 May 2005 04:19:17 +0000 Subject: syncing to FFmpeg libavcodec build 4754 CVS patchset: 7522 CVS date: 2005/05/06 04:19:17 --- src/libffmpeg/libavcodec/motion_est.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libffmpeg/libavcodec/motion_est.c') diff --git a/src/libffmpeg/libavcodec/motion_est.c b/src/libffmpeg/libavcodec/motion_est.c index 9aaad6daa..0136dcdfe 100644 --- a/src/libffmpeg/libavcodec/motion_est.c +++ b/src/libffmpeg/libavcodec/motion_est.c @@ -272,7 +272,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]){ @@ -1303,7 +1303,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); if(s->flags&CODEC_FLAG_MV0) if(mx || my) - mb_type |= CANDIDATE_MB_TYPE_SKIPED; //FIXME check difference + mb_type |= CANDIDATE_MB_TYPE_SKIPPED; //FIXME check difference }else{ mx <<=shift; my <<=shift; -- cgit v1.2.3