From bb3b9aa93f5f699c986d8ac5e6d6f3ceffab41c9 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 20 Feb 2014 20:26:53 -0800 Subject: [PATCH] move nestegg to third_party Change-Id: Idf58109195a88dec66c5e1ea6a51c61e6c659ff1 --- examples.mk | 14 +++++++------- test/test.mk | 12 ++++++------ test/webm_video_source.h | 2 +- .../nestegg}/0001-include-paths.diff | 6 +++--- ...0002-ne_read_simple-uninitialized_variable.diff | 0 {nestegg => third_party/nestegg}/AUTHORS | 0 {nestegg => third_party/nestegg}/INSTALL | 0 {nestegg => third_party/nestegg}/LICENSE | 0 {nestegg => third_party/nestegg}/README | 0 {nestegg => third_party/nestegg}/README.webm | 0 {nestegg => third_party/nestegg}/TODO | 0 {nestegg => third_party/nestegg}/halloc/README | 0 {nestegg => third_party/nestegg}/halloc/halloc.h | 0 .../nestegg}/halloc/src/align.h | 0 .../nestegg}/halloc/src/halloc.c | 2 +- .../nestegg}/halloc/src/hlist.h | 0 .../nestegg}/halloc/src/macros.h | 0 .../nestegg}/include/nestegg/nestegg.h | 0 {nestegg => third_party/nestegg}/src/nestegg.c | 4 ++-- {nestegg => third_party/nestegg}/test/test.c | 0 webmdec.c | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) rename {nestegg => third_party/nestegg}/0001-include-paths.diff (87%) rename {nestegg => third_party/nestegg}/0002-ne_read_simple-uninitialized_variable.diff (100%) rename {nestegg => third_party/nestegg}/AUTHORS (100%) rename {nestegg => third_party/nestegg}/INSTALL (100%) rename {nestegg => third_party/nestegg}/LICENSE (100%) rename {nestegg => third_party/nestegg}/README (100%) rename {nestegg => third_party/nestegg}/README.webm (100%) rename {nestegg => third_party/nestegg}/TODO (100%) rename {nestegg => third_party/nestegg}/halloc/README (100%) rename {nestegg => third_party/nestegg}/halloc/halloc.h (100%) rename {nestegg => third_party/nestegg}/halloc/src/align.h (100%) rename {nestegg => third_party/nestegg}/halloc/src/halloc.c (98%) rename {nestegg => third_party/nestegg}/halloc/src/hlist.h (100%) rename {nestegg => third_party/nestegg}/halloc/src/macros.h (100%) rename {nestegg => third_party/nestegg}/include/nestegg/nestegg.h (100%) rename {nestegg => third_party/nestegg}/src/nestegg.c (99%) rename {nestegg => third_party/nestegg}/test/test.c (100%) diff --git a/examples.mk b/examples.mk index 40756e182..18530bbe8 100644 --- a/examples.mk +++ b/examples.mk @@ -26,13 +26,13 @@ vpxdec.SRCS += ivfdec.c ivfdec.h vpxdec.SRCS += tools_common.c tools_common.h vpxdec.SRCS += webmdec.c webmdec.h vpxdec.SRCS += y4menc.c y4menc.h -vpxdec.SRCS += nestegg/halloc/halloc.h -vpxdec.SRCS += nestegg/halloc/src/align.h -vpxdec.SRCS += nestegg/halloc/src/halloc.c -vpxdec.SRCS += nestegg/halloc/src/hlist.h -vpxdec.SRCS += nestegg/halloc/src/macros.h -vpxdec.SRCS += nestegg/include/nestegg/nestegg.h -vpxdec.SRCS += nestegg/src/nestegg.c +vpxdec.SRCS += third_party/nestegg/halloc/halloc.h +vpxdec.SRCS += third_party/nestegg/halloc/src/align.h +vpxdec.SRCS += third_party/nestegg/halloc/src/halloc.c +vpxdec.SRCS += third_party/nestegg/halloc/src/hlist.h +vpxdec.SRCS += third_party/nestegg/halloc/src/macros.h +vpxdec.SRCS += third_party/nestegg/include/nestegg/nestegg.h +vpxdec.SRCS += third_party/nestegg/src/nestegg.c vpxdec.SRCS += $(LIBYUV_SRCS) vpxdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950 vpxdec.DESCRIPTION = Full featured decoder diff --git a/test/test.mk b/test/test.mk index cabfc678d..38628757a 100644 --- a/test/test.mk +++ b/test/test.mk @@ -39,12 +39,12 @@ LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ivf_video_source.h LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += external_frame_buffer_test.cc ## WebM Parsing -NESTEGG_SRCS += ../nestegg/halloc/halloc.h -NESTEGG_SRCS += ../nestegg/halloc/src/align.h -NESTEGG_SRCS += ../nestegg/halloc/src/halloc.c -NESTEGG_SRCS += ../nestegg/halloc/src/hlist.h -NESTEGG_SRCS += ../nestegg/include/nestegg/nestegg.h -NESTEGG_SRCS += ../nestegg/src/nestegg.c +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) LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += webm_video_source.h diff --git a/test/webm_video_source.h b/test/webm_video_source.h index 4dcf4dc97..9d88ae360 100644 --- a/test/webm_video_source.h +++ b/test/webm_video_source.h @@ -14,7 +14,7 @@ #include #include #include -#include "nestegg/include/nestegg/nestegg.h" +#include "third_party/nestegg/include/nestegg/nestegg.h" #include "test/video_source.h" namespace libvpx_test { diff --git a/nestegg/0001-include-paths.diff b/third_party/nestegg/0001-include-paths.diff similarity index 87% rename from nestegg/0001-include-paths.diff rename to third_party/nestegg/0001-include-paths.diff index b6e07ae12..a704ebdcd 100644 --- a/nestegg/0001-include-paths.diff +++ b/third_party/nestegg/0001-include-paths.diff @@ -7,7 +7,7 @@ index 5758fc0..837b3ff 100644 #include /* memset & co */ -#include "halloc.h" -+#include "nestegg/halloc/halloc.h" ++#include "third_party/nestegg/halloc/halloc.h" #include "align.h" #include "hlist.h" @@ -34,8 +34,8 @@ index daf1eed..4fb10e7 100644 -#include "halloc.h" -#include "nestegg/nestegg.h" -+#include "nestegg/halloc/halloc.h" -+#include "nestegg/include/nestegg/nestegg.h" ++#include "third_party/nestegg/halloc/halloc.h" ++#include "third_party/nestegg/include/nestegg/nestegg.h" /* EBML Elements */ #define ID_EBML 0x1a45dfa3 diff --git a/nestegg/0002-ne_read_simple-uninitialized_variable.diff b/third_party/nestegg/0002-ne_read_simple-uninitialized_variable.diff similarity index 100% rename from nestegg/0002-ne_read_simple-uninitialized_variable.diff rename to third_party/nestegg/0002-ne_read_simple-uninitialized_variable.diff diff --git a/nestegg/AUTHORS b/third_party/nestegg/AUTHORS similarity index 100% rename from nestegg/AUTHORS rename to third_party/nestegg/AUTHORS diff --git a/nestegg/INSTALL b/third_party/nestegg/INSTALL similarity index 100% rename from nestegg/INSTALL rename to third_party/nestegg/INSTALL diff --git a/nestegg/LICENSE b/third_party/nestegg/LICENSE similarity index 100% rename from nestegg/LICENSE rename to third_party/nestegg/LICENSE diff --git a/nestegg/README b/third_party/nestegg/README similarity index 100% rename from nestegg/README rename to third_party/nestegg/README diff --git a/nestegg/README.webm b/third_party/nestegg/README.webm similarity index 100% rename from nestegg/README.webm rename to third_party/nestegg/README.webm diff --git a/nestegg/TODO b/third_party/nestegg/TODO similarity index 100% rename from nestegg/TODO rename to third_party/nestegg/TODO diff --git a/nestegg/halloc/README b/third_party/nestegg/halloc/README similarity index 100% rename from nestegg/halloc/README rename to third_party/nestegg/halloc/README diff --git a/nestegg/halloc/halloc.h b/third_party/nestegg/halloc/halloc.h similarity index 100% rename from nestegg/halloc/halloc.h rename to third_party/nestegg/halloc/halloc.h diff --git a/nestegg/halloc/src/align.h b/third_party/nestegg/halloc/src/align.h similarity index 100% rename from nestegg/halloc/src/align.h rename to third_party/nestegg/halloc/src/align.h diff --git a/nestegg/halloc/src/halloc.c b/third_party/nestegg/halloc/src/halloc.c similarity index 98% rename from nestegg/halloc/src/halloc.c rename to third_party/nestegg/halloc/src/halloc.c index 837b3ff01..8860d736a 100644 --- a/nestegg/halloc/src/halloc.c +++ b/third_party/nestegg/halloc/src/halloc.c @@ -15,7 +15,7 @@ #include /* realloc */ #include /* memset & co */ -#include "nestegg/halloc/halloc.h" +#include "third_party/nestegg/halloc/halloc.h" #include "align.h" #include "hlist.h" diff --git a/nestegg/halloc/src/hlist.h b/third_party/nestegg/halloc/src/hlist.h similarity index 100% rename from nestegg/halloc/src/hlist.h rename to third_party/nestegg/halloc/src/hlist.h diff --git a/nestegg/halloc/src/macros.h b/third_party/nestegg/halloc/src/macros.h similarity index 100% rename from nestegg/halloc/src/macros.h rename to third_party/nestegg/halloc/src/macros.h diff --git a/nestegg/include/nestegg/nestegg.h b/third_party/nestegg/include/nestegg/nestegg.h similarity index 100% rename from nestegg/include/nestegg/nestegg.h rename to third_party/nestegg/include/nestegg/nestegg.h diff --git a/nestegg/src/nestegg.c b/third_party/nestegg/src/nestegg.c similarity index 99% rename from nestegg/src/nestegg.c rename to third_party/nestegg/src/nestegg.c index b6bc46093..30e0e2bb8 100644 --- a/nestegg/src/nestegg.c +++ b/third_party/nestegg/src/nestegg.c @@ -8,8 +8,8 @@ #include #include -#include "nestegg/halloc/halloc.h" -#include "nestegg/include/nestegg/nestegg.h" +#include "third_party/nestegg/halloc/halloc.h" +#include "third_party/nestegg/include/nestegg/nestegg.h" /* EBML Elements */ #define ID_EBML 0x1a45dfa3 diff --git a/nestegg/test/test.c b/third_party/nestegg/test/test.c similarity index 100% rename from nestegg/test/test.c rename to third_party/nestegg/test/test.c diff --git a/webmdec.c b/webmdec.c index 081d57ab8..7cacdf922 100644 --- a/webmdec.c +++ b/webmdec.c @@ -12,7 +12,7 @@ #include -#include "nestegg/include/nestegg/nestegg.h" +#include "third_party/nestegg/include/nestegg/nestegg.h" static int nestegg_read_cb(void *buffer, size_t length, void *userdata) { FILE *f = userdata; -- 2.40.0