Merge "Move vp9_extend.{h,c} from common to encoder"

diff --combined vp9/encoder/vp9_firstpass.c
index 70d711ceee7d5a75d422266f659086e91596e4db,1dca8799a73561ba1c91de0e5b6ad63e7b786ae3..d80ecb152fc013b2824b8f594d1d6456c87fbcb5
--- 1/vp9/encoder/vp9_firstpass.c
--- 2/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@@ -11,16 -11,16 +11,16 @@@
  #include <math.h>
  #include <limits.h>
  #include <stdio.h>
+ #include "vp9/common/vp9_systemdependent.h"
  #include "vp9/encoder/vp9_block.h"
+ #include "vp9/encoder/vp9_encodeframe.h"
+ #include "vp9/encoder/vp9_encodemb.h"
+ #include "vp9/encoder/vp9_extend.h"
+ #include "vp9/encoder/vp9_firstpass.h"
+ #include "vp9/encoder/vp9_mcomp.h"
  #include "vp9/encoder/vp9_onyx_int.h"
  #include "vp9/encoder/vp9_variance.h"
- #include "vp9/encoder/vp9_mcomp.h"
- #include "vp9/encoder/vp9_firstpass.h"
  #include "vpx_scale/vpx_scale.h"
- #include "vp9/encoder/vp9_encodeframe.h"
- #include "vp9/encoder/vp9_encodemb.h"
- #include "vp9/common/vp9_extend.h"
- #include "vp9/common/vp9_systemdependent.h"
  #include "vpx_mem/vpx_mem.h"
  #include "vpx_scale/yv12config.h"
  #include "vp9/encoder/vp9_quantize.h"
@@@ -406,6 -406,8 +406,6 @@@ static void first_pass_motion_search(VP
    // for first pass test
    while ((quart_frm << sr) < MAX_FULL_PEL_VAL)
      sr++;
 -  if (sr)
 -    sr--;
  
    step_param    += sr;
    further_steps -= sr;

diff --combined vp9/vp9_common.mk
index 1b38aa1bd169fd64edd4be600d8c8c2b242c606b,dda52074d922dac23d2550b85602415d7c455153..57ede0fd316e6d046c64f5d3813a9b9842b580eb
--- 1/vp9/vp9_common.mk
--- 2/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@@ -21,7 -21,6 +21,6 @@@ VP9_COMMON_SRCS-yes += common/vp9_defau
  VP9_COMMON_SRCS-yes += common/vp9_entropy.c
  VP9_COMMON_SRCS-yes += common/vp9_entropymode.c
  VP9_COMMON_SRCS-yes += common/vp9_entropymv.c
- VP9_COMMON_SRCS-yes += common/vp9_extend.c
  VP9_COMMON_SRCS-yes += common/vp9_filter.c
  VP9_COMMON_SRCS-yes += common/vp9_filter.h
  VP9_COMMON_SRCS-yes += common/vp9_findnearmv.c
@@@ -34,7 -33,6 +33,6 @@@ VP9_COMMON_SRCS-yes += common/vp9_entro
  VP9_COMMON_SRCS-yes += common/vp9_entropymode.h
  VP9_COMMON_SRCS-yes += common/vp9_entropymv.h
  VP9_COMMON_SRCS-yes += common/vp9_enums.h
- VP9_COMMON_SRCS-yes += common/vp9_extend.h
  VP9_COMMON_SRCS-yes += common/vp9_findnearmv.h
  VP9_COMMON_SRCS-yes += common/vp9_idct.h
  VP9_COMMON_SRCS-yes += common/vp9_loopfilter.h
@@@ -123,7 -121,6 +121,7 @@@ VP9_COMMON_SRCS-$(HAVE_SSE2) += common/
  
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_convolve_neon.c
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_idct16x16_neon.c
 +VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_loopfilter_16_neon.c
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_convolve8_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_convolve8_avg_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_loopfilter_neon$(ASM)