From 48e76ff4fde05a03a395a31950de87692a579829 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Fri, 24 Sep 2010 11:21:35 -0400 Subject: [PATCH] move reconintra_mt to decoder (for now) reconintra_mt.c is only required for building the decoder right now. It could definitely be used for the encoder in the future, but it currently depends on decoder only data structures. (onyxd_int.h, VP8D_COMP, etc). Move it from common/ to decoder/ until the necessary changes to the common multithread code are complete. This patch is needed to build with --disable-vp8-decoder. Change-Id: I568c52221a2b309234d269675cba97131ce35c86 --- vp8/{common => decoder}/reconintra_mt.c | 0 vp8/vp8_common.mk | 2 -- vp8/vp8dx.mk | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) rename vp8/{common => decoder}/reconintra_mt.c (100%) diff --git a/vp8/common/reconintra_mt.c b/vp8/decoder/reconintra_mt.c similarity index 100% rename from vp8/common/reconintra_mt.c rename to vp8/decoder/reconintra_mt.c diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index b357b28bc..ecca18a0a 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -81,8 +81,6 @@ VP8_COMMON_SRCS-yes += common/recon.c VP8_COMMON_SRCS-yes += common/reconinter.c VP8_COMMON_SRCS-yes += common/reconintra.c VP8_COMMON_SRCS-yes += common/reconintra4x4.c -VP8_COMMON_SRCS-yes += common/reconintra_mt.h -VP8_COMMON_SRCS-yes += common/reconintra_mt.c VP8_COMMON_SRCS-yes += common/setupintrarecon.c VP8_COMMON_SRCS-yes += common/swapyv12buffer.c VP8_COMMON_SRCS-yes += common/textblit.c diff --git a/vp8/vp8dx.mk b/vp8/vp8dx.mk index 941961708..1acd67453 100644 --- a/vp8/vp8dx.mk +++ b/vp8/vp8dx.mk @@ -67,6 +67,8 @@ VP8_DX_SRCS-yes += decoder/treereader.h VP8_DX_SRCS-yes += decoder/onyxd_if.c VP8_DX_SRCS-yes += decoder/threading.c VP8_DX_SRCS-yes += decoder/idct_blk.c +VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/reconintra_mt.h +VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/reconintra_mt.c VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) -- 2.40.0