diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-12-17 15:41:30 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-12-17 15:41:30 +0000 |
| commit | 95cefcb4ed4c0af96dea5fb993ee8349d1391021 (patch) | |
| tree | b2ae6fad3efa6eefba5110265e614387308100df /libavcodec/motion_est.c | |
| parent | c29ff23c2a4598c567e6428a25e56c9c6f68320b (diff) | |
10l
Originally committed as revision 7328 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
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<<ME_MAP_SHIFT); int dia_size= FFMAX(FFABS(s->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"); |