From 86f46814506e029ee448b76d1afcce5537be3972 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 7 Oct 2013 13:06:53 -0700 Subject: [PATCH] Moving libmkv library to third_party folder. Change-Id: Id0bfaedf54ff3f59d4cf361c170a0b5a5711e5f2 --- examples.mk | 6 +++--- {libmkv => third_party/libmkv}/EbmlBufferWriter.c | 0 {libmkv => third_party/libmkv}/EbmlBufferWriter.h | 0 {libmkv => third_party/libmkv}/EbmlIDs.h | 0 {libmkv => third_party/libmkv}/EbmlWriter.c | 0 {libmkv => third_party/libmkv}/EbmlWriter.h | 0 {libmkv => third_party/libmkv}/Makefile | 0 {libmkv => third_party/libmkv}/WebMElement.c | 0 {libmkv => third_party/libmkv}/WebMElement.h | 0 {libmkv => third_party/libmkv}/testlibmkv.c | 0 vpxenc.c | 4 ++-- 11 files changed, 5 insertions(+), 5 deletions(-) rename {libmkv => third_party/libmkv}/EbmlBufferWriter.c (100%) rename {libmkv => third_party/libmkv}/EbmlBufferWriter.h (100%) rename {libmkv => third_party/libmkv}/EbmlIDs.h (100%) rename {libmkv => third_party/libmkv}/EbmlWriter.c (100%) rename {libmkv => third_party/libmkv}/EbmlWriter.h (100%) rename {libmkv => third_party/libmkv}/Makefile (100%) rename {libmkv => third_party/libmkv}/WebMElement.c (100%) rename {libmkv => third_party/libmkv}/WebMElement.h (100%) rename {libmkv => third_party/libmkv}/testlibmkv.c (100%) diff --git a/examples.mk b/examples.mk index 7b47ade..88327fe 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 similarity index 100% rename from libmkv/EbmlBufferWriter.c rename to third_party/libmkv/EbmlBufferWriter.c diff --git a/libmkv/EbmlBufferWriter.h b/third_party/libmkv/EbmlBufferWriter.h similarity index 100% rename from libmkv/EbmlBufferWriter.h rename to third_party/libmkv/EbmlBufferWriter.h diff --git a/libmkv/EbmlIDs.h b/third_party/libmkv/EbmlIDs.h similarity index 100% rename from libmkv/EbmlIDs.h rename to third_party/libmkv/EbmlIDs.h diff --git a/libmkv/EbmlWriter.c b/third_party/libmkv/EbmlWriter.c similarity index 100% rename from libmkv/EbmlWriter.c rename to third_party/libmkv/EbmlWriter.c diff --git a/libmkv/EbmlWriter.h b/third_party/libmkv/EbmlWriter.h similarity index 100% rename from libmkv/EbmlWriter.h rename to third_party/libmkv/EbmlWriter.h diff --git a/libmkv/Makefile b/third_party/libmkv/Makefile similarity index 100% rename from libmkv/Makefile rename to third_party/libmkv/Makefile diff --git a/libmkv/WebMElement.c b/third_party/libmkv/WebMElement.c similarity index 100% rename from libmkv/WebMElement.c rename to third_party/libmkv/WebMElement.c diff --git a/libmkv/WebMElement.h b/third_party/libmkv/WebMElement.h similarity index 100% rename from libmkv/WebMElement.h rename to third_party/libmkv/WebMElement.h diff --git a/libmkv/testlibmkv.c b/third_party/libmkv/testlibmkv.c similarity index 100% rename from libmkv/testlibmkv.c rename to third_party/libmkv/testlibmkv.c diff --git a/vpxenc.c b/vpxenc.c index 71cf01f..d7c6c0e 100644 --- a/vpxenc.c +++ b/vpxenc.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 */ -- 2.7.4