diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-19 11:56:02 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-28 07:39:05 -0700 |
| commit | 92a4c591122fa406a1d7aed834a5283a86d9758a (patch) | |
| tree | 0e1267c1337a0b8b2dc68c502e4dbd3e0aee6795 /examples.mk | |
| parent | 4d903f47b656a4f7cefb8dafba35a12821c148e3 (diff) | |
| download | libvpx-92a4c591122fa406a1d7aed834a5283a86d9758a.tar libvpx-92a4c591122fa406a1d7aed834a5283a86d9758a.tar.gz libvpx-92a4c591122fa406a1d7aed834a5283a86d9758a.tar.bz2 libvpx-92a4c591122fa406a1d7aed834a5283a86d9758a.zip | |
Changing webmenc to use libwebm
Changing webmenc to use libwebm for WebM file muxing.
Change-Id: I42eb688953865003214c05bdf2076ee00db28970
Diffstat (limited to 'examples.mk')
| -rw-r--r-- | examples.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/examples.mk b/examples.mk index 87be5a8c9..f091c2de4 100644 --- a/examples.mk +++ b/examples.mk @@ -15,6 +15,16 @@ LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ third_party/libyuv/source/scale.c \ third_party/libyuv/source/cpu_id.c +LIBWEBM_MUXER_SRCS += third_party/libwebm/mkvmuxer.cpp \ + third_party/libwebm/mkvmuxerutil.cpp \ + third_party/libwebm/mkvwriter.cpp \ + third_party/libwebm/mkvmuxer.hpp \ + third_party/libwebm/mkvmuxertypes.hpp \ + third_party/libwebm/mkvmuxerutil.hpp \ + third_party/libwebm/mkvparser.hpp \ + third_party/libwebm/mkvwriter.hpp \ + third_party/libwebm/webmids.hpp + # List of examples to build. UTILS are tools meant for distribution # while EXAMPLES demonstrate specific portions of the API. UTILS-$(CONFIG_DECODERS) += vpxdec.c @@ -53,10 +63,8 @@ vpxenc.SRCS += vpx_ports/vpx_timer.h vpxenc.SRCS += vpxstats.c vpxstats.h vpxenc.SRCS += $(LIBYUV_SRCS) ifeq ($(CONFIG_WEBM_IO),yes) - vpxenc.SRCS += third_party/libmkv/EbmlIDs.h - vpxenc.SRCS += third_party/libmkv/EbmlWriter.c - vpxenc.SRCS += third_party/libmkv/EbmlWriter.h - vpxenc.SRCS += webmenc.c webmenc.h + vpxenc.SRCS += $(LIBWEBM_MUXER_SRCS) + vpxenc.SRCS += webmenc.cc webmenc.h endif vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 vpxenc.DESCRIPTION = Full featured encoder |