diff options
author | James Zern <jzern@google.com> | 2014-02-20 20:26:53 -0800 |
---|---|---|
committer | James Zern <jzern@google.com> | 2014-02-21 17:16:04 -0800 |
commit | bb3b9aa93f5f699c986d8ac5e6d6f3ceffab41c9 (patch) | |
tree | f88c422d31b2d1f70787e49fa6680a6c5a270b27 | |
parent | a0f0655b5e5739f1acbefb4e4b4fe1f778ecea45 (diff) | |
download | libvpx-bb3b9aa93f5f699c986d8ac5e6d6f3ceffab41c9.tar libvpx-bb3b9aa93f5f699c986d8ac5e6d6f3ceffab41c9.tar.gz libvpx-bb3b9aa93f5f699c986d8ac5e6d6f3ceffab41c9.tar.bz2 libvpx-bb3b9aa93f5f699c986d8ac5e6d6f3ceffab41c9.zip |
move nestegg to third_party
Change-Id: Idf58109195a88dec66c5e1ea6a51c61e6c659ff1
-rw-r--r-- | examples.mk | 14 | ||||
-rw-r--r-- | test/test.mk | 12 | ||||
-rw-r--r-- | test/webm_video_source.h | 2 | ||||
-rw-r--r-- | third_party/nestegg/0001-include-paths.diff (renamed from nestegg/0001-include-paths.diff) | 6 | ||||
-rw-r--r-- | third_party/nestegg/0002-ne_read_simple-uninitialized_variable.diff (renamed from nestegg/0002-ne_read_simple-uninitialized_variable.diff) | 0 | ||||
-rw-r--r-- | third_party/nestegg/AUTHORS (renamed from nestegg/AUTHORS) | 0 | ||||
-rw-r--r-- | third_party/nestegg/INSTALL (renamed from nestegg/INSTALL) | 0 | ||||
-rw-r--r-- | third_party/nestegg/LICENSE (renamed from nestegg/LICENSE) | 0 | ||||
-rw-r--r-- | third_party/nestegg/README (renamed from nestegg/README) | 0 | ||||
-rw-r--r-- | third_party/nestegg/README.webm (renamed from nestegg/README.webm) | 0 | ||||
-rw-r--r-- | third_party/nestegg/TODO (renamed from nestegg/TODO) | 0 | ||||
-rw-r--r-- | third_party/nestegg/halloc/README (renamed from nestegg/halloc/README) | 0 | ||||
-rw-r--r-- | third_party/nestegg/halloc/halloc.h (renamed from nestegg/halloc/halloc.h) | 0 | ||||
-rw-r--r-- | third_party/nestegg/halloc/src/align.h (renamed from nestegg/halloc/src/align.h) | 0 | ||||
-rw-r--r-- | third_party/nestegg/halloc/src/halloc.c (renamed from nestegg/halloc/src/halloc.c) | 2 | ||||
-rw-r--r-- | third_party/nestegg/halloc/src/hlist.h (renamed from nestegg/halloc/src/hlist.h) | 0 | ||||
-rw-r--r-- | third_party/nestegg/halloc/src/macros.h (renamed from nestegg/halloc/src/macros.h) | 0 | ||||
-rw-r--r-- | third_party/nestegg/include/nestegg/nestegg.h (renamed from nestegg/include/nestegg/nestegg.h) | 0 | ||||
-rw-r--r-- | third_party/nestegg/src/nestegg.c (renamed from nestegg/src/nestegg.c) | 4 | ||||
-rw-r--r-- | third_party/nestegg/test/test.c (renamed from nestegg/test/test.c) | 0 | ||||
-rw-r--r-- | webmdec.c | 2 |
21 files changed, 21 insertions, 21 deletions
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 <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 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 <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 index c3bc9e575..c3bc9e575 100644 --- a/nestegg/0002-ne_read_simple-uninitialized_variable.diff +++ b/third_party/nestegg/0002-ne_read_simple-uninitialized_variable.diff diff --git a/nestegg/AUTHORS b/third_party/nestegg/AUTHORS index 7d2c61265..7d2c61265 100644 --- a/nestegg/AUTHORS +++ b/third_party/nestegg/AUTHORS diff --git a/nestegg/INSTALL b/third_party/nestegg/INSTALL index 401df4184..401df4184 100644 --- a/nestegg/INSTALL +++ b/third_party/nestegg/INSTALL diff --git a/nestegg/LICENSE b/third_party/nestegg/LICENSE index a67984a61..a67984a61 100644 --- a/nestegg/LICENSE +++ b/third_party/nestegg/LICENSE diff --git a/nestegg/README b/third_party/nestegg/README index 47c8237d2..47c8237d2 100644 --- a/nestegg/README +++ b/third_party/nestegg/README diff --git a/nestegg/README.webm b/third_party/nestegg/README.webm index c93116882..c93116882 100644 --- a/nestegg/README.webm +++ b/third_party/nestegg/README.webm diff --git a/nestegg/TODO b/third_party/nestegg/TODO index bf0cb04c4..bf0cb04c4 100644 --- a/nestegg/TODO +++ b/third_party/nestegg/TODO diff --git a/nestegg/halloc/README b/third_party/nestegg/halloc/README index 380fba2b8..380fba2b8 100644 --- a/nestegg/halloc/README +++ b/third_party/nestegg/halloc/README diff --git a/nestegg/halloc/halloc.h b/third_party/nestegg/halloc/halloc.h index 10af4e8d8..10af4e8d8 100644 --- a/nestegg/halloc/halloc.h +++ b/third_party/nestegg/halloc/halloc.h diff --git a/nestegg/halloc/src/align.h b/third_party/nestegg/halloc/src/align.h index 4c6e1831f..4c6e1831f 100644 --- a/nestegg/halloc/src/align.h +++ b/third_party/nestegg/halloc/src/align.h diff --git a/nestegg/halloc/src/halloc.c b/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 <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 index 2791f78c7..2791f78c7 100644 --- a/nestegg/halloc/src/hlist.h +++ b/third_party/nestegg/halloc/src/hlist.h diff --git a/nestegg/halloc/src/macros.h b/third_party/nestegg/halloc/src/macros.h index 1f84bc277..1f84bc277 100644 --- a/nestegg/halloc/src/macros.h +++ b/third_party/nestegg/halloc/src/macros.h diff --git a/nestegg/include/nestegg/nestegg.h b/third_party/nestegg/include/nestegg/nestegg.h index c18d1d3bf..c18d1d3bf 100644 --- a/nestegg/include/nestegg/nestegg.h +++ b/third_party/nestegg/include/nestegg/nestegg.h diff --git a/nestegg/src/nestegg.c b/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 <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 index cc0753de7..cc0753de7 100644 --- a/nestegg/test/test.c +++ b/third_party/nestegg/test/test.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; |