]> granicus.if.org Git - libvpx/commitdiff
Merge "vp9_reconinter.h static functions in header converted to global"
authorJim Bankoski <jimbankoski@google.com>
Mon, 10 Mar 2014 14:36:05 +0000 (07:36 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 10 Mar 2014 14:36:05 +0000 (07:36 -0700)
1  2 
vp9/decoder/vp9_decodeframe.c
vp9/decoder/vp9_dthread.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_pickmode.c
vp9/encoder/vp9_rdopt.c

Simple merge
Simple merge
Simple merge
Simple merge
index d4953cf6b3953026e3d70312c92df4fd23af5fb6,f9d59096b17fff0089ebd1316a1905bf82a9429f..3a73d3ef41b333b6fd5a289e31d053b0f123689d
@@@ -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.
Simple merge