diff options
author | John Koleszar <jkoleszar@google.com> | 2010-10-21 15:02:10 -0400 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2010-10-25 22:12:44 -0400 |
commit | ea68ee0458acf1b9eb27a41083d165de084e4c45 (patch) | |
tree | 5a0d7b629f7f778dbe9dda95928dca10be778f1f /examples.mk | |
parent | dc66630cca948880b1e90548511114577917969d (diff) | |
download | libvpx-ea68ee0458acf1b9eb27a41083d165de084e4c45.tar libvpx-ea68ee0458acf1b9eb27a41083d165de084e4c45.tar.gz libvpx-ea68ee0458acf1b9eb27a41083d165de084e4c45.tar.bz2 libvpx-ea68ee0458acf1b9eb27a41083d165de084e4c45.zip |
rename ivf{enc,dec} to vpx{enc,dec}
The new WebM output support should be preferred to IVF, but we can't
change the default behavior of the ivf* tools. There are a few other
default behaviors for these tools that are counterintuitive for
historical reasons, and changing the binary name provides the
opportunity to clean those up as well. This patch takes the first
step by renaming the binaries.
Change-Id: I647008ae37cc352dd27ec1da7ed13489e0609b24
Diffstat (limited to 'examples.mk')
-rw-r--r-- | examples.mk | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/examples.mk b/examples.mk index ef1d1a26b..28fc6eaa9 100644 --- a/examples.mk +++ b/examples.mk @@ -12,29 +12,38 @@ # List of examples to build. UTILS are files that are taken from the source # tree directly, and GEN_EXAMPLES are files that are created from the # examples folder. -UTILS-$(CONFIG_DECODERS) += ivfdec.c -ivfdec.SRCS += md5_utils.c md5_utils.h -ivfdec.SRCS += vpx_ports/vpx_timer.h -ivfdec.SRCS += vpx/vpx_integer.h -ivfdec.SRCS += args.c args.h vpx_ports/config.h -ivfdec.SRCS += nestegg/halloc/halloc.h -ivfdec.SRCS += nestegg/halloc/src/align.h -ivfdec.SRCS += nestegg/halloc/src/halloc.c -ivfdec.SRCS += nestegg/halloc/src/hlist.h -ivfdec.SRCS += nestegg/halloc/src/macros.h -ivfdec.SRCS += nestegg/include/nestegg/nestegg.h -ivfdec.SRCS += nestegg/src/nestegg.c -ivfdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950 -ivfdec.DESCRIPTION = Full featured decoder -UTILS-$(CONFIG_ENCODERS) += ivfenc.c -ivfenc.SRCS += args.c args.h y4minput.c y4minput.h -ivfenc.SRCS += vpx_ports/config.h vpx_ports/mem_ops.h -ivfenc.SRCS += vpx_ports/mem_ops_aligned.h -ivfenc.SRCS += libmkv/EbmlIDs.h -ivfenc.SRCS += libmkv/EbmlWriter.c -ivfenc.SRCS += libmkv/EbmlWriter.h -ivfenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 -ivfenc.DESCRIPTION = Full featured encoder +UTILS-$(CONFIG_DECODERS) += vpxdec.c +vpxdec.SRCS += md5_utils.c md5_utils.h +vpxdec.SRCS += vpx_ports/vpx_timer.h +vpxdec.SRCS += vpx/vpx_integer.h +vpxdec.SRCS += args.c args.h vpx_ports/config.h +vpxdec.SRCS += nestegg/halloc/halloc.h +vpxdec.SRCS += nestegg/halloc/src/align.h +vpxdec.SRCS += nestegg/halloc/src/halloc.c +vpxdec.SRCS += nestegg/halloc/src/hlist.h +vpxdec.SRCS += nestegg/halloc/src/macros.h +vpxdec.SRCS += nestegg/include/nestegg/nestegg.h +vpxdec.SRCS += nestegg/src/nestegg.c +vpxdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950 +vpxdec.DESCRIPTION = Full featured decoder +UTILS-$(CONFIG_ENCODERS) += vpxenc.c +vpxenc.SRCS += args.c args.h y4minput.c y4minput.h +vpxenc.SRCS += vpx_ports/config.h vpx_ports/mem_ops.h +vpxenc.SRCS += vpx_ports/mem_ops_aligned.h +vpxenc.SRCS += libmkv/EbmlIDs.h +vpxenc.SRCS += libmkv/EbmlWriter.c +vpxenc.SRCS += libmkv/EbmlWriter.h +vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 +vpxenc.DESCRIPTION = Full featured encoder + +# Clean up old ivfenc, ivfdec binaries. +ifeq ($(CONFIG_MSVS),yes) +CLEAN-OBJS += $(foreach p,$(VS_PLATFORMS),$(p)/Release/ivfenc.exe) +CLEAN-OBJS += $(foreach p,$(VS_PLATFORMS),$(p)/Release/ivfdec.exe) +else +CLEAN-OBJS += ivfenc{.c.o,.c.d,.dox,.exe} +CLEAN-OBJS += ivfdec{.c.o,.c.d,.dox,.exe} +endif # XMA example disabled for now, not used in VP8 #UTILS-$(CONFIG_DECODERS) += example_xma.c |