summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorJim Bankoski <jimbankoski@google.com>2013-08-05 14:48:20 -0700
committerJim Bankoski <jimbankoski@google.com>2013-08-05 14:48:20 -0700
commitf4837579d1b2fed66f01bd5d939b4cb8617de5e1 (patch)
tree5779431a307e5c081ca5ca7d7586341f6ba10ec5 /vp9/common
parenta5a73224597b1c14ddfabfefed7e19d83c85acc6 (diff)
downloadlibvpx-f4837579d1b2fed66f01bd5d939b4cb8617de5e1.tar
libvpx-f4837579d1b2fed66f01bd5d939b4cb8617de5e1.tar.gz
libvpx-f4837579d1b2fed66f01bd5d939b4cb8617de5e1.tar.bz2
libvpx-f4837579d1b2fed66f01bd5d939b4cb8617de5e1.zip
fixed script problem with config_force_x86_inc
Change-Id: I226e5094d216b09dc47fa5511a66e2d314608000
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_rtcd_defs.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh
index ec420735a..2b16cfaff 100644
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -21,7 +21,7 @@ EOF
forward_decls vp9_common_forward_decls
# x86inc.asm doesn't work if pic is enabled on 32 bit platforms so no assembly.
-[ $arch = "x86_64" -o ! "$CONFIG_PIC" = "yes" -o $CONFIG_FORCE_X86INC == "yes"] && mmx_x86inc=mmx && sse2_x86inc=sse2 && ssse3_x86inc=ssse3
+[ $arch = "x86_64" -o ! "$CONFIG_PIC" = "yes" -o "$CONFIG_FORCE_X86INC" == "yes" ] && mmx_x86inc=mmx && sse2_x86inc=sse2 && ssse3_x86inc=ssse3
# this variable is for functions that are 64 bit only.
[ $arch = "x86_64" ] && mmx_x86_64=mmx && sse2_x86_64=sse2 && ssse3_x86_64=ssse3
@@ -704,7 +704,7 @@ prototype int64_t vp9_block_error "int16_t *coeff, int16_t *dqcoeff, intptr_t bl
specialize vp9_block_error sse2
prototype void vp9_subtract_block "int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride"
-specialize vp9_subtract_block sse2
+specialize vp9_subtract_block $sse2_x86inc
prototype void vp9_quantize_b "int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, int16_t *zbin_ptr, int16_t *round_ptr, int16_t *quant_ptr, int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"
specialize vp9_quantize_b $ssse3_x86_64