diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-05-22 12:30:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-22 12:30:38 -0700 |
| commit | b59b3241713282d50af2dce6ae5a1f57223ca6b2 (patch) | |
| tree | f391aac9b678e7cf84e292d723b272411f595e93 /vp8 | |
| parent | 6e6f5881d8f23cee4d21d4ae86d59363713f3bf4 (diff) | |
| parent | e272273443ceec31d586003e740af97541e9c4ce (diff) | |
| download | libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.tar libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.tar.gz libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.tar.bz2 libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.zip | |
Merge "Renames x86_64 specific asm files"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/x86/loopfilter_block_sse2_x86_64.asm (renamed from vp8/common/x86/loopfilter_block_sse2.asm) | 0 | ||||
| -rw-r--r-- | vp8/encoder/x86/ssim_opt_x86_64.asm (renamed from vp8/encoder/x86/ssim_opt.asm) | 0 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 2 | ||||
| -rw-r--r-- | vp8/vp8cx.mk | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/vp8/common/x86/loopfilter_block_sse2.asm b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm index 6d5aaa19d..6d5aaa19d 100644 --- a/vp8/common/x86/loopfilter_block_sse2.asm +++ b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm diff --git a/vp8/encoder/x86/ssim_opt.asm b/vp8/encoder/x86/ssim_opt_x86_64.asm index 5964a85f2..5964a85f2 100644 --- a/vp8/encoder/x86/ssim_opt.asm +++ b/vp8/encoder/x86/ssim_opt_x86_64.asm diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 8282547ea..9eb308985 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -115,7 +115,7 @@ VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm endif ifeq ($(ARCH_X86_64),yes) -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_block_sse2.asm +VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_block_sse2_x86_64.asm endif # common (c) diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index 607382b4c..b7b948add 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -100,7 +100,7 @@ VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm -VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm +VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt_x86_64.asm ifeq ($(CONFIG_REALTIME_ONLY),yes) VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm |