diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-21 10:16:22 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-21 10:16:22 -0800 |
| commit | 16954cb327279be100e815eadb1454dfc85c8a4c (patch) | |
| tree | a48b3c3d44edd221c56654654fa933c64aea213a | |
| parent | 2696ba0be62abde1e8f495529ce31d70c300527b (diff) | |
| parent | 98254a441b1b97b9540f552344c85bae4bc3fb55 (diff) | |
| download | libvpx-16954cb327279be100e815eadb1454dfc85c8a4c.tar libvpx-16954cb327279be100e815eadb1454dfc85c8a4c.tar.gz libvpx-16954cb327279be100e815eadb1454dfc85c8a4c.tar.bz2 libvpx-16954cb327279be100e815eadb1454dfc85c8a4c.zip | |
Merge "Moving vp8_multi_resolution_encoder to examples folder."
| -rw-r--r-- | examples.mk | 12 | ||||
| -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 6befa506f..b29ab9c34 100644 --- a/examples.mk +++ b/examples.mk @@ -110,11 +110,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 |