Merge "Move bit reader files to vpx_dsp"
authorYaowu Xu <yaowu@google.com>
Mon, 20 Jul 2015 14:52:49 +0000 (14:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 20 Jul 2015 14:52:50 +0000 (14:52 +0000)
1  2 
vp9/vp9_common.mk

diff --combined vp9/vp9_common.mk
@@@ -38,8 -38,6 +38,6 @@@ VP9_COMMON_SRCS-yes += common/vp9_mv.
  VP9_COMMON_SRCS-yes += common/vp9_onyxc_int.h
  VP9_COMMON_SRCS-yes += common/vp9_pred_common.h
  VP9_COMMON_SRCS-yes += common/vp9_pred_common.c
- VP9_COMMON_SRCS-yes += common/vp9_prob.h
- VP9_COMMON_SRCS-yes += common/vp9_prob.c
  VP9_COMMON_SRCS-yes += common/vp9_quant_common.h
  VP9_COMMON_SRCS-yes += common/vp9_reconinter.h
  VP9_COMMON_SRCS-yes += common/vp9_reconintra.h
@@@ -118,6 -116,13 +116,6 @@@ VP9_COMMON_SRCS-$(HAVE_DSPR2)  += commo
  VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans16_dspr2.c
  VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans32_cols_dspr2.c
  VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans32_dspr2.c
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_loopfilter_filters_dspr2.c
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_loopfilter_filters_dspr2.h
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_loopfilter_macros_dspr2.h
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_loopfilter_masks_dspr2.h
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c
 -VP9_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c
  
  # common (msa)
  VP9_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_convolve8_avg_horiz_msa.c