diff options
| author | James Zern <jzern@google.com> | 2016-03-26 12:52:49 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-03-26 12:56:21 -0700 |
| commit | ee1bd86d9cee3f5599facc833302f43515e6b472 (patch) | |
| tree | ae23375b7af4174e142cfd14923af4332f349408 /examples.mk | |
| parent | aa1132d1de6d81d276e698947607c56532235c55 (diff) | |
| download | libvpx-ee1bd86d9cee3f5599facc833302f43515e6b472.tar libvpx-ee1bd86d9cee3f5599facc833302f43515e6b472.tar.gz libvpx-ee1bd86d9cee3f5599facc833302f43515e6b472.tar.bz2 libvpx-ee1bd86d9cee3f5599facc833302f43515e6b472.zip | |
Revert "third_party: Roll libwebm snapshot."
This reverts commit 80ddeb281a0d4b3d9a6d39a7ef91370f52845b39.
breaks Android build and causes valgrind failures in the examples
Change-Id: Ie13ceed2f9f8970af87339b807032a52083f27fe
Diffstat (limited to 'examples.mk')
| -rw-r--r-- | examples.mk | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/examples.mk b/examples.mk index c891a5496..f10bec68c 100644 --- a/examples.mk +++ b/examples.mk @@ -36,30 +36,21 @@ LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ third_party/libyuv/source/scale_neon64.cc \ third_party/libyuv/source/scale_win.cc \ -LIBWEBM_COMMON_SRCS += third_party/libwebm/common/hdr_util.cc \ - third_party/libwebm/common/hdr_util.h \ - third_party/libwebm/common/webmids.h +LIBWEBM_COMMON_SRCS += third_party/libwebm/webmids.hpp -LIBWEBM_MUXER_SRCS += third_party/libwebm/mkvmuxer/mkvmuxer.cc \ - third_party/libwebm/mkvmuxer/mkvmuxerutil.cc \ - third_party/libwebm/mkvmuxer/mkvwriter.cc \ - third_party/libwebm/mkvmuxer/mkvmuxer.h \ - third_party/libwebm/mkvmuxer/mkvmuxertypes.h \ - third_party/libwebm/mkvmuxer/mkvmuxerutil.h \ - third_party/libwebm/mkvparser/mkvparser.h \ - third_party/libwebm/mkvmuxer/mkvwriter.h - -LIBWEBM_PARSER_SRCS = third_party/libwebm/mkvparser/mkvparser.cc \ - third_party/libwebm/mkvparser/mkvreader.cc \ - third_party/libwebm/mkvparser/mkvparser.h \ - third_party/libwebm/mkvparser/mkvreader.h - -# Add compile flags and include path for libwebm sources. -ifeq ($(CONFIG_WEBM_IO),yes) - CXXFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS - INC_PATH-yes += $(SRC_PATH_BARE)/third_party/libwebm -endif +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 +LIBWEBM_PARSER_SRCS = third_party/libwebm/mkvparser.cpp \ + third_party/libwebm/mkvreader.cpp \ + third_party/libwebm/mkvparser.hpp \ + third_party/libwebm/mkvreader.hpp # List of examples to build. UTILS are tools meant for distribution # while EXAMPLES demonstrate specific portions of the API. @@ -79,7 +70,6 @@ ifeq ($(CONFIG_LIBYUV),yes) endif ifeq ($(CONFIG_WEBM_IO),yes) vpxdec.SRCS += $(LIBWEBM_COMMON_SRCS) - vpxdec.SRCS += $(LIBWEBM_MUXER_SRCS) vpxdec.SRCS += $(LIBWEBM_PARSER_SRCS) vpxdec.SRCS += webmdec.cc webmdec.h endif @@ -103,7 +93,6 @@ endif ifeq ($(CONFIG_WEBM_IO),yes) vpxenc.SRCS += $(LIBWEBM_COMMON_SRCS) vpxenc.SRCS += $(LIBWEBM_MUXER_SRCS) - vpxenc.SRCS += $(LIBWEBM_PARSER_SRCS) vpxenc.SRCS += webmenc.cc webmenc.h endif vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 |