From: Fiona Glaser Date: Sun, 24 May 2009 20:58:08 +0000 (-0400) Subject: Fix 10L in r1155 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb3759477da1397153a6be504d1caf45eea8a080;p=libx264 Fix 10L in r1155 Broke --me esa/tesa due to forgetting to add handling for x264_cost_mv_fpel. --- diff --git a/encoder/me.c b/encoder/me.c index 243c1d05..7e0ddcfc 100644 --- a/encoder/me.c +++ b/encoder/me.c @@ -23,6 +23,7 @@ *****************************************************************************/ #include "common/common.h" +#include "macroblock.h" #include "me.h" /* presets selected from good points on the speed-vs-quality curve of several test videos @@ -476,7 +477,7 @@ me_hex2: int delta = x264_pixel_size[sad_size].w; int16_t *xs = h->scratch_buffer; int xn; - uint16_t *cost_fpel_mvx = x264_cost_mv_fpel[h->mb.i_qp][-m->mvp[0]&3] + (-m->mvp[0]>>2); + uint16_t *cost_fpel_mvx = x264_cost_mv_fpel[x264_lambda_tab[h->mb.i_qp]][-m->mvp[0]&3] + (-m->mvp[0]>>2); h->pixf.sad_x4[sad_size]( zero, m->p_fenc[0], m->p_fenc[0]+delta, m->p_fenc[0]+delta*FENC_STRIDE, m->p_fenc[0]+delta+delta*FENC_STRIDE,