diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-13 12:24:56 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-13 12:24:56 -0700 |
| commit | 706d4a7c2931fa8e8e6e05b49936c4a7a1b542ab (patch) | |
| tree | 945e22ae196730ee4642ea584a45774a83428c4b | |
| parent | f36ba3da20a8899b17ef4c8ac89cf0887af3c17e (diff) | |
| parent | 86f46814506e029ee448b76d1afcce5537be3972 (diff) | |
| download | libvpx-706d4a7c2931fa8e8e6e05b49936c4a7a1b542ab.tar libvpx-706d4a7c2931fa8e8e6e05b49936c4a7a1b542ab.tar.gz libvpx-706d4a7c2931fa8e8e6e05b49936c4a7a1b542ab.tar.bz2 libvpx-706d4a7c2931fa8e8e6e05b49936c4a7a1b542ab.zip | |
Merge "Moving libmkv library to third_party folder."
| -rw-r--r-- | examples.mk | 6 | ||||
| -rw-r--r-- | third_party/libmkv/EbmlBufferWriter.c (renamed from libmkv/EbmlBufferWriter.c) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/EbmlBufferWriter.h (renamed from libmkv/EbmlBufferWriter.h) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/EbmlIDs.h (renamed from libmkv/EbmlIDs.h) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/EbmlWriter.c (renamed from libmkv/EbmlWriter.c) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/EbmlWriter.h (renamed from libmkv/EbmlWriter.h) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/Makefile (renamed from libmkv/Makefile) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/WebMElement.c (renamed from libmkv/WebMElement.c) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/WebMElement.h (renamed from libmkv/WebMElement.h) | 0 | ||||
| -rw-r--r-- | third_party/libmkv/testlibmkv.c (renamed from libmkv/testlibmkv.c) | 0 | ||||
| -rw-r--r-- | vpxenc.c | 4 |
11 files changed, 5 insertions, 5 deletions
diff --git a/examples.mk b/examples.mk index 7b47ade86..88327fed6 100644 --- a/examples.mk +++ b/examples.mk @@ -40,9 +40,9 @@ vpxenc.SRCS += tools_common.c tools_common.h vpxenc.SRCS += vpx_ports/mem_ops.h vpxenc.SRCS += vpx_ports/mem_ops_aligned.h vpxenc.SRCS += vpx_ports/vpx_timer.h -vpxenc.SRCS += libmkv/EbmlIDs.h -vpxenc.SRCS += libmkv/EbmlWriter.c -vpxenc.SRCS += libmkv/EbmlWriter.h +vpxenc.SRCS += third_party/libmkv/EbmlIDs.h +vpxenc.SRCS += third_party/libmkv/EbmlWriter.c +vpxenc.SRCS += third_party/libmkv/EbmlWriter.h vpxenc.SRCS += $(LIBYUV_SRCS) vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1 vpxenc.DESCRIPTION = Full featured encoder diff --git a/libmkv/EbmlBufferWriter.c b/third_party/libmkv/EbmlBufferWriter.c index 574e47899..574e47899 100644 --- a/libmkv/EbmlBufferWriter.c +++ b/third_party/libmkv/EbmlBufferWriter.c diff --git a/libmkv/EbmlBufferWriter.h b/third_party/libmkv/EbmlBufferWriter.h index acd5c2a28..acd5c2a28 100644 --- a/libmkv/EbmlBufferWriter.h +++ b/third_party/libmkv/EbmlBufferWriter.h diff --git a/libmkv/EbmlIDs.h b/third_party/libmkv/EbmlIDs.h index 44d438583..44d438583 100644 --- a/libmkv/EbmlIDs.h +++ b/third_party/libmkv/EbmlIDs.h diff --git a/libmkv/EbmlWriter.c b/third_party/libmkv/EbmlWriter.c index 27cfe861c..27cfe861c 100644 --- a/libmkv/EbmlWriter.c +++ b/third_party/libmkv/EbmlWriter.c diff --git a/libmkv/EbmlWriter.h b/third_party/libmkv/EbmlWriter.h index b94f75733..b94f75733 100644 --- a/libmkv/EbmlWriter.h +++ b/third_party/libmkv/EbmlWriter.h diff --git a/libmkv/Makefile b/third_party/libmkv/Makefile index b53377b21..b53377b21 100644 --- a/libmkv/Makefile +++ b/third_party/libmkv/Makefile diff --git a/libmkv/WebMElement.c b/third_party/libmkv/WebMElement.c index 2f79a3c6a..2f79a3c6a 100644 --- a/libmkv/WebMElement.c +++ b/third_party/libmkv/WebMElement.c diff --git a/libmkv/WebMElement.h b/third_party/libmkv/WebMElement.h index d9ad0a04f..d9ad0a04f 100644 --- a/libmkv/WebMElement.h +++ b/third_party/libmkv/WebMElement.h diff --git a/libmkv/testlibmkv.c b/third_party/libmkv/testlibmkv.c index 97bcf956a..97bcf956a 100644 --- a/libmkv/testlibmkv.c +++ b/third_party/libmkv/testlibmkv.c @@ -45,8 +45,8 @@ #include "vpx_ports/vpx_timer.h" #include "tools_common.h" #include "y4minput.h" -#include "libmkv/EbmlWriter.h" -#include "libmkv/EbmlIDs.h" +#include "third_party/libmkv/EbmlWriter.h" +#include "third_party/libmkv/EbmlIDs.h" #include "third_party/libyuv/include/libyuv/scale.h" /* Need special handling of these functions on Windows */ |