[x264-devel] commit: Fix 10L in r1155 (Jason Garrett-Glaser )
git version control
git at videolan.org
Sun May 24 23:02:39 CEST 2009
x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sun May 24 16:58:08 2009 -0400| [a2c01c124e4ee4b9d71a4b2a20ed572d439aea7b] | committer: Jason Garrett-Glaser
Fix 10L in r1155
Broke --me esa/tesa due to forgetting to add handling for x264_cost_mv_fpel.
> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=a2c01c124e4ee4b9d71a4b2a20ed572d439aea7b
---
encoder/me.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/encoder/me.c b/encoder/me.c
index 15416de..6fb4dd9 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,
More information about the x264-devel
mailing list