Merge changes from topic 'missing-proto' into nextgenv2 * changes: vp10/encoder/rdopt.c: make a function static vp10/encoder/rd.c: make a function static vp10_convolve_ssse3.c: make some functions static vp10/encoder/bitstream.[hc]: correct a prototype vp10/common/idct.h: add some missing prototypes highbd_quantize_intrin_sse2.c: add missing rtcd include vp10: add some missing includes
diff --git a/vp10/common/vp10_rtcd_defs.pl b/vp10/common/vp10_rtcd_defs.pl index 369933d..8b973f9 100644 --- a/vp10/common/vp10_rtcd_defs.pl +++ b/vp10/common/vp10_rtcd_defs.pl
@@ -268,16 +268,11 @@ add_proto qw/void vp10_iht16x16_256_add/, "const tran_low_t *input, uint8_t *output, int pitch, int tx_type"; specialize qw/vp10_iht16x16_256_add sse2 dspr2/; -if (!(vpx_config("CONFIG_VP10") eq "yes" && vpx_config("CONFIG_EXT_TX") eq "yes")) { - add_proto qw/void vp10_iht4x4_16_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type"; - specialize qw/vp10_iht4x4_16_add msa/; - - add_proto qw/void vp10_iht8x8_64_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type"; - specialize qw/vp10_iht8x8_64_add msa/; - - add_proto qw/void vp10_iht16x16_256_add/, "const tran_low_t *input, uint8_t *output, int pitch, int tx_type"; - specialize qw/vp10_iht16x16_256_add msa/; -} + if (vpx_config("CONFIG_EXT_TX") ne "yes") { + specialize qw/vp10_iht4x4_16_add msa/; + specialize qw/vp10_iht8x8_64_add msa/; + specialize qw/vp10_iht16x16_256_add msa/; + } add_proto qw/void vp10_fdct4x4/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/vp10_fdct4x4 sse2/; @@ -456,16 +451,11 @@ add_proto qw/void vp10_fht16x16/, "const int16_t *input, tran_low_t *output, int stride, int tx_type"; specialize qw/vp10_fht16x16 sse2/; -if (!(vpx_config("CONFIG_VP10") eq "yes" && vpx_config("CONFIG_EXT_TX") eq "yes")) { - add_proto qw/void vp10_fht4x4/, "const int16_t *input, tran_low_t *output, int stride, int tx_type"; - specialize qw/vp10_fht4x4 msa/; - - add_proto qw/void vp10_fht8x8/, "const int16_t *input, tran_low_t *output, int stride, int tx_type"; - specialize qw/vp10_fht8x8 msa/; - - add_proto qw/void vp10_fht16x16/, "const int16_t *input, tran_low_t *output, int stride, int tx_type"; - specialize qw/vp10_fht16x16 msa/; -} + if (vpx_config("CONFIG_EXT_TX") ne "yes") { + specialize qw/vp10_fht4x4 msa/; + specialize qw/vp10_fht8x8 msa/; + specialize qw/vp10_fht16x16 msa/; + } add_proto qw/void vp10_fht32x32/, "const int16_t *input, tran_low_t *output, int stride, int tx_type"; specialize qw/vp10_fht32x32/;