From e93046a49cc86e0acbab1311c2ca926402606fc4 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 7 Jan 2019 16:29:24 -0800 Subject: [PATCH] vp8_copy32xn: resolve missing declaration BUG=webm:1584 Change-Id: I9898a6e2f977acd4e26b09222a1eb2ab4f37f0af --- vp8/{common => encoder}/copy_c.c | 0 vp8/{common => encoder}/x86/copy_sse2.asm | 0 vp8/{common => encoder}/x86/copy_sse3.asm | 0 vp8/vp8_common.mk | 3 --- vp8/vp8cx.mk | 3 +++ 5 files changed, 3 insertions(+), 3 deletions(-) rename vp8/{common => encoder}/copy_c.c (100%) rename vp8/{common => encoder}/x86/copy_sse2.asm (100%) rename vp8/{common => encoder}/x86/copy_sse3.asm (100%) diff --git a/vp8/common/copy_c.c b/vp8/encoder/copy_c.c similarity index 100% rename from vp8/common/copy_c.c rename to vp8/encoder/copy_c.c diff --git a/vp8/common/x86/copy_sse2.asm b/vp8/encoder/x86/copy_sse2.asm similarity index 100% rename from vp8/common/x86/copy_sse2.asm rename to vp8/encoder/x86/copy_sse2.asm diff --git a/vp8/common/x86/copy_sse3.asm b/vp8/encoder/x86/copy_sse3.asm similarity index 100% rename from vp8/common/x86/copy_sse3.asm rename to vp8/encoder/x86/copy_sse3.asm diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 9f106a2c3..3fa0901ac 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -15,7 +15,6 @@ VP8_COMMON_SRCS-yes += common/onyxd.h VP8_COMMON_SRCS-yes += common/alloccommon.c VP8_COMMON_SRCS-yes += common/blockd.c VP8_COMMON_SRCS-yes += common/coefupdateprobs.h -VP8_COMMON_SRCS-yes += common/copy_c.c # VP8_COMMON_SRCS-yes += common/debugmodes.c VP8_COMMON_SRCS-yes += common/default_coef_probs.h VP8_COMMON_SRCS-yes += common/dequantize.c @@ -80,7 +79,6 @@ VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idct_blk_mmx.c VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/copy_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_blk_sse2.c VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_sse2.asm @@ -88,7 +86,6 @@ VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/bilinear_filter_sse2.c VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/copy_sse3.asm VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm ifeq ($(CONFIG_POSTPROC),yes) diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index ab85eddd2..3a8f8ea45 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -23,6 +23,7 @@ VP8_CX_SRCS-yes += vp8_cx_iface.c VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h VP8_CX_SRCS-yes += encoder/bitstream.c VP8_CX_SRCS-yes += encoder/boolhuff.c +VP8_CX_SRCS-yes += encoder/copy_c.c VP8_CX_SRCS-yes += encoder/dct.c VP8_CX_SRCS-yes += encoder/encodeframe.c VP8_CX_SRCS-yes += encoder/encodeframe.h @@ -82,6 +83,8 @@ VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.c VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.h endif +VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/copy_sse2.asm +VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/copy_sse3.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_quantize_sse2.c -- 2.40.0