From 95cefcb4ed4c0af96dea5fb993ee8349d1391021 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 17 Dec 2006 15:41:30 +0000 Subject: 10l Originally committed as revision 7328 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/motion_est.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/motion_est.c') diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 2df1f31e8d..94a0aa51dd 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -230,9 +230,9 @@ static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){ void ff_init_me(MpegEncContext *s){ MotionEstContext * const c= &s->me; - c->avctx= s->avctx; int cache_size= FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<avctx->dia_size)&255, FFABS(s->avctx->pre_dia_size)&255); + c->avctx= s->avctx; if(cache_size < 2*dia_size && !c->stride){ av_log(s->avctx, AV_LOG_INFO, "ME_MAP size may be a little small for the selected diamond size\n"); -- cgit v1.2.3