diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-04-03 00:41:14 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-04-24 11:58:42 -0700 |
| commit | dbd24710c7e9991339ebb00d44daf50a4d8ac158 (patch) | |
| tree | 4a69d77ffe5aa6dc325d0561e781d70f1ca33d52 /test/test.mk | |
| parent | 910136320ca136c17bfe57686c3073475416bbad (diff) | |
| download | libvpx-dbd24710c7e9991339ebb00d44daf50a4d8ac158.tar libvpx-dbd24710c7e9991339ebb00d44daf50a4d8ac158.tar.gz libvpx-dbd24710c7e9991339ebb00d44daf50a4d8ac158.tar.bz2 libvpx-dbd24710c7e9991339ebb00d44daf50a4d8ac158.zip | |
Changing webmdec to use libwebm
Changing webmdec to use libwebm for WebM file parsing.
Change-Id: I2a57a7b44dbed05eaa04409e1e75e6fc03b30fbc
Diffstat (limited to 'test/test.mk')
| -rw-r--r-- | test/test.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/test.mk b/test/test.mk index a489e631c..157953542 100644 --- a/test/test.mk +++ b/test/test.mk @@ -43,15 +43,13 @@ LIBVPX_TEST_SRCS-yes += encode_test_driver.h ## WebM Parsing ifeq ($(CONFIG_WEBM_IO), yes) -NESTEGG_SRCS += ../third_party/nestegg/halloc/halloc.h -NESTEGG_SRCS += ../third_party/nestegg/halloc/src/align.h -NESTEGG_SRCS += ../third_party/nestegg/halloc/src/halloc.c -NESTEGG_SRCS += ../third_party/nestegg/halloc/src/hlist.h -NESTEGG_SRCS += ../third_party/nestegg/include/nestegg/nestegg.h -NESTEGG_SRCS += ../third_party/nestegg/src/nestegg.c -LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += $(NESTEGG_SRCS) +LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvparser.cpp +LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvreader.cpp +LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvparser.hpp +LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvreader.hpp +LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += $(LIBWEBM_PARSER_SRCS) LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ../tools_common.h -LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ../webmdec.c +LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ../webmdec.cc LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ../webmdec.h LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += webm_video_source.h endif |