Merge "Modified mv prediction." into experimental

fbc8e8f9 · Paul Wilkins · Gerrit Code Review · 89d62e3b · d22f3d9f · fbc8e8f9
Commit fbc8e8f9 authored Nov 26, 2012 by Paul Wilkins Committed by Gerrit Code Review Nov 26, 2012
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 84 additions and 270 deletions

vp9/encoder/rdopt.c vp9/encoder/rdopt.c +84 -265

vp9/encoder/rdopt.h vp9/encoder/rdopt.h +0 -5

No files found.
--- a/vp9/encoder/rdopt.c
+++ b/vp9/encoder/rdopt.c
--- a/vp9/encoder/rdopt.h
+++ b/vp9/encoder/rdopt.h
@@ -33,11 +33,6 @@ extern int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
                                         int recon_yoffset, int recon_uvoffset,
                                         int *returnrate, int *returndist);

-extern void vp9_mv_pred(VP9_COMP *cpi, MACROBLOCKD *xd,
-                        const MODE_INFO *here, int_mv *mvp,
-                        int refframe, int *ref_frame_sign_bias,
-                        int *sr, int near_sadidx[]);
-
 extern void vp9_init_me_luts();

 extern void vp9_set_mbmode_and_mvs(MACROBLOCK *x,