From: Jim Bankoski <jimbankoski@google.com>
Date: Mon, 10 Mar 2014 14:36:05 +0000 (-0700)
Subject: Merge "vp9_reconinter.h static functions in header converted to global"
X-Git-Tag: v1.4.0~2115
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=622f06eb597fb4ffb2737bf6a507baead91f1ec3;p=platform%2Fupstream%2Flibvpx.git

Merge "vp9_reconinter.h static functions in header converted to global"
---

622f06eb597fb4ffb2737bf6a507baead91f1ec3
diff --cc vp9/encoder/vp9_pickmode.c
index d4953cf,f9d5909..3a73d3e
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@@ -59,10 -59,10 +59,10 @@@ static int full_pixel_motion_search(VP9
      for (i = 0; i < MAX_MB_PLANE; i++)
        backup_yv12[i] = xd->plane[i].pre[0];
  
-     setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL);
+     vp9_setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL);
    }
  
 -  vp9_set_mv_search_range(x, &ref_mv.as_mv);
 +  vp9_set_mv_search_range(x, &ref_mv);
  
    // TODO(jingning) exploiting adaptive motion search control in non-RD
    // mode decision too.