diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-09-24 08:46:35 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2010-09-24 08:46:35 -0700 |
| commit | dbd57c2663ce62a74c5f303ac906bddcc03628b5 (patch) | |
| tree | 5e562c9c53c89db4a324206697c8d34a06b6e264 /vp8 | |
| parent | aab0f5b121e2ca7fb294358ceb904b2f91225e6f (diff) | |
| parent | 48e76ff4fde05a03a395a31950de87692a579829 (diff) | |
| download | libvpx-dbd57c2663ce62a74c5f303ac906bddcc03628b5.tar libvpx-dbd57c2663ce62a74c5f303ac906bddcc03628b5.tar.gz libvpx-dbd57c2663ce62a74c5f303ac906bddcc03628b5.tar.bz2 libvpx-dbd57c2663ce62a74c5f303ac906bddcc03628b5.zip | |
Merge "move reconintra_mt to decoder (for now)"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/decoder/reconintra_mt.c (renamed from vp8/common/reconintra_mt.c) | 0 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 2 | ||||
| -rw-r--r-- | vp8/vp8dx.mk | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/vp8/common/reconintra_mt.c b/vp8/decoder/reconintra_mt.c index 4d395629d..4d395629d 100644 --- a/vp8/common/reconintra_mt.c +++ b/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)) |