summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-01-17 16:56:04 -0800
committerDmitry Kovalev <dkovalev@google.com>2014-01-17 16:57:37 -0800
commit98254a441b1b97b9540f552344c85bae4bc3fb55 (patch)
tree1e109c6ec2903cc80fd5d4c3203fbeda48c9c3af
parent7e157467dccec39b9863ab077a696189576283ce (diff)
downloadlibvpx-98254a441b1b97b9540f552344c85bae4bc3fb55.tar
libvpx-98254a441b1b97b9540f552344c85bae4bc3fb55.tar.gz
libvpx-98254a441b1b97b9540f552344c85bae4bc3fb55.tar.bz2
libvpx-98254a441b1b97b9540f552344c85bae4bc3fb55.zip
Moving vp8_multi_resolution_encoder to examples folder.
Change-Id: If0e1cd13aecd1620d26c28bf95e4f84469f78456
-rw-r--r--examples.mk12
-rw-r--r--examples/vp8_multi_resolution_encoder.c (renamed from vp8_multi_resolution_encoder.c)0
2 files changed, 7 insertions, 5 deletions
diff --git a/examples.mk b/examples.mk
index 66b719ca0..4da3e0b47 100644
--- a/examples.mk
+++ b/examples.mk
@@ -109,11 +109,13 @@ GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8cx_set_ref.c
vp8cx_set_ref.GUID = C5E31F7F-96F6-48BD-BD3E-10EBF6E8057A
vp8cx_set_ref.DESCRIPTION = VP8 set encoder reference frame
-# C file is provided, not generated automatically.
-UTILS-$(CONFIG_MULTI_RES_ENCODING) += vp8_multi_resolution_encoder.c
-vp8_multi_resolution_encoder.SRCS += $(LIBYUV_SRCS)
-vp8_multi_resolution_encoder.GUID = 04f8738e-63c8-423b-90fa-7c2703a374de
-vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding
+
+ifeq ($(CONFIG_MULTI_RES_ENCODING),yes)
+GEN_EXAMPLES-$(CONFIG_VP8_DECODER) += vp8_multi_resolution_encoder.c
+vp8_multi_resolution_encoder.SRCS += $(LIBYUV_SRCS)
+vp8_multi_resolution_encoder.GUID = 04f8738e-63c8-423b-90fa-7c2703a374de
+vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding
+endif
# Handle extra library flags depending on codec configuration
diff --git a/vp8_multi_resolution_encoder.c b/examples/vp8_multi_resolution_encoder.c
index 4c29056e5..4c29056e5 100644
--- a/vp8_multi_resolution_encoder.c
+++ b/examples/vp8_multi_resolution_encoder.c