move nestegg to third_party

Change-Id: Idf58109195a88dec66c5e1ea6a51c61e6c659ff1

diff --git a/examples.mk b/examples.mk
index 40756e1824edad53f50ff63503b351b3b81339ae..18530bbe836a6bcd90f351489a8bac3bc9c78f7e 100644 (file)
--- 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 cabfc678d07ad898d8ae36fdfec71836b4fcfdd0..38628757a9f173d90e00fb624cc48f1bcc5aa381 100644 (file)
--- 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 4dcf4dc978721fd6a2498d3857407cf2757f7f20..9d88ae3608f98931b07c5ab173db11f7ad396643 100644 (file)
--- a/test/webm_video_source.h
+++ b/test/webm_video_source.h
@@ -14,7 +14,7 @@
 #include <cstdlib>
 #include <new>
 #include <string>
-#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 b6e07ae1232de717d8202a7cb0898ee430395d10..a704ebdcd525ad5bd6e234d3f451034c3f014402 100644 (file)
--- a/nestegg/0001-include-paths.diff
+++ b/third_party/nestegg/0001-include-paths.diff
@@ -7,7 +7,7 @@ index 5758fc0..837b3ff 100644
  #include <string.h>  /* 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 837b3ff011b2b8c9745d676747d5163c179545c1..8860d736a54a5ff1f6a58a6aeb82177310dd09b9 100644 (file)
--- a/nestegg/halloc/src/halloc.c
+++ b/third_party/nestegg/halloc/src/halloc.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>  /* realloc */
 #include <string.h>  /* 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 b6bc460939ac6774ed8fbae03a115415211a7190..30e0e2bb8d6054d47dc7f777926d08aba49099ad 100644 (file)
--- a/nestegg/src/nestegg.c
+++ b/third_party/nestegg/src/nestegg.c
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <string.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/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 081d57ab803381f3dbbf657870b4617ebdd0cfc8..7cacdf922e89f89b87bc81f7689e110fa93a26f0 100644 (file)
--- a/webmdec.c
+++ b/webmdec.c
@@ -12,7 +12,7 @@
 
 #include <stdarg.h>
 
-#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;