generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "move nestegg to third_party"

Browse Source
This commit is contained in:
James Zern 2014-02-22 11:43:37 -08:00 committed by Gerrit Code Review
commit 8e3ef6c0e1
21 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples.mk
View File

@ -26,13 +26,13 @@ vpxdec.SRCS += ivfdec.c ivfdec.h
vpxdec.SRCS += tools_common.c tools_common.h vpxdec.SRCS += tools_common.c tools_common.h
vpxdec.SRCS += webmdec.c webmdec.h vpxdec.SRCS += webmdec.c webmdec.h
vpxdec.SRCS += y4menc.c y4menc.h vpxdec.SRCS += y4menc.c y4menc.h
vpxdec.SRCS += nestegg/halloc/halloc.h vpxdec.SRCS += third_party/nestegg/halloc/halloc.h
vpxdec.SRCS += nestegg/halloc/src/align.h vpxdec.SRCS += third_party/nestegg/halloc/src/align.h
vpxdec.SRCS += nestegg/halloc/src/halloc.c vpxdec.SRCS += third_party/nestegg/halloc/src/halloc.c
vpxdec.SRCS += nestegg/halloc/src/hlist.h vpxdec.SRCS += third_party/nestegg/halloc/src/hlist.h
vpxdec.SRCS += nestegg/halloc/src/macros.h vpxdec.SRCS += third_party/nestegg/halloc/src/macros.h
vpxdec.SRCS += nestegg/include/nestegg/nestegg.h vpxdec.SRCS += third_party/nestegg/include/nestegg/nestegg.h
vpxdec.SRCS += nestegg/src/nestegg.c vpxdec.SRCS += third_party/nestegg/src/nestegg.c
vpxdec.SRCS += $(LIBYUV_SRCS) vpxdec.SRCS += $(LIBYUV_SRCS)
vpxdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950 vpxdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950
vpxdec.DESCRIPTION = Full featured decoder vpxdec.DESCRIPTION = Full featured decoder

12
test/test.mk
View File

@ -39,12 +39,12 @@ LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ivf_video_source.h
LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += external_frame_buffer_test.cc LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += external_frame_buffer_test.cc
## WebM Parsing ## WebM Parsing
NESTEGG_SRCS += ../nestegg/halloc/halloc.h NESTEGG_SRCS += ../third_party/nestegg/halloc/halloc.h
NESTEGG_SRCS += ../nestegg/halloc/src/align.h NESTEGG_SRCS += ../third_party/nestegg/halloc/src/align.h
NESTEGG_SRCS += ../nestegg/halloc/src/halloc.c NESTEGG_SRCS += ../third_party/nestegg/halloc/src/halloc.c
NESTEGG_SRCS += ../nestegg/halloc/src/hlist.h NESTEGG_SRCS += ../third_party/nestegg/halloc/src/hlist.h
NESTEGG_SRCS += ../nestegg/include/nestegg/nestegg.h NESTEGG_SRCS += ../third_party/nestegg/include/nestegg/nestegg.h
NESTEGG_SRCS += ../nestegg/src/nestegg.c NESTEGG_SRCS += ../third_party/nestegg/src/nestegg.c
LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += $(NESTEGG_SRCS) LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += $(NESTEGG_SRCS)
LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += webm_video_source.h LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += webm_video_source.h

2
test/webm_video_source.h
View File

@ -14,7 +14,7 @@
#include <cstdlib> #include <cstdlib>
#include <new> #include <new>
#include <string> #include <string>
#include "nestegg/include/nestegg/nestegg.h" #include "third_party/nestegg/include/nestegg/nestegg.h"
#include "test/video_source.h" #include "test/video_source.h"
namespace libvpx_test { namespace libvpx_test {

6
nestegg/0001-include-paths.diff → third_party/nestegg/0001-include-paths.diff vendored
View File

@ -7,7 +7,7 @@ index 5758fc0..837b3ff 100644
#include <string.h> /* memset & co */ #include <string.h> /* memset & co */
-#include "halloc.h" -#include "halloc.h"
+#include "nestegg/halloc/halloc.h" +#include "third_party/nestegg/halloc/halloc.h"
#include "align.h" #include "align.h"
#include "hlist.h" #include "hlist.h"
@ -34,8 +34,8 @@ index daf1eed..4fb10e7 100644
-#include "halloc.h" -#include "halloc.h"
-#include "nestegg/nestegg.h" -#include "nestegg/nestegg.h"
+#include "nestegg/halloc/halloc.h" +#include "third_party/nestegg/halloc/halloc.h"
+#include "nestegg/include/nestegg/nestegg.h" +#include "third_party/nestegg/include/nestegg/nestegg.h"
/* EBML Elements */ /* EBML Elements */
#define ID_EBML 0x1a45dfa3 #define ID_EBML 0x1a45dfa3

0
nestegg/0002-ne_read_simple-uninitialized_variable.diff → third_party/nestegg/0002-ne_read_simple-uninitialized_variable.diff vendored
View File

0
nestegg/AUTHORS → third_party/nestegg/AUTHORS vendored
View File

0
nestegg/INSTALL → third_party/nestegg/INSTALL vendored
View File

0
nestegg/LICENSE → third_party/nestegg/LICENSE vendored
View File

0
nestegg/README → third_party/nestegg/README vendored
View File

0
nestegg/README.webm → third_party/nestegg/README.webm vendored
View File

0
nestegg/TODO → third_party/nestegg/TODO vendored
View File

0
nestegg/halloc/README → third_party/nestegg/halloc/README vendored
View File

0
nestegg/halloc/halloc.h → third_party/nestegg/halloc/halloc.h vendored
View File

0
nestegg/halloc/src/align.h → third_party/nestegg/halloc/src/align.h vendored
View File

2
nestegg/halloc/src/halloc.c → third_party/nestegg/halloc/src/halloc.c vendored
View File

@ -15,7 +15,7 @@
#include <stdlib.h> /* realloc */ #include <stdlib.h> /* realloc */
#include <string.h> /* memset & co */ #include <string.h> /* memset & co */
#include "nestegg/halloc/halloc.h" #include "third_party/nestegg/halloc/halloc.h"
#include "align.h" #include "align.h"
#include "hlist.h" #include "hlist.h"

0
nestegg/halloc/src/hlist.h → third_party/nestegg/halloc/src/hlist.h vendored
View File

0
nestegg/halloc/src/macros.h → third_party/nestegg/halloc/src/macros.h vendored
View File

0
nestegg/include/nestegg/nestegg.h → third_party/nestegg/include/nestegg/nestegg.h vendored
View File

4
nestegg/src/nestegg.c → third_party/nestegg/src/nestegg.c vendored
View File

@ -8,8 +8,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "nestegg/halloc/halloc.h" #include "third_party/nestegg/halloc/halloc.h"
#include "nestegg/include/nestegg/nestegg.h" #include "third_party/nestegg/include/nestegg/nestegg.h"
/* EBML Elements */ /* EBML Elements */
#define ID_EBML 0x1a45dfa3 #define ID_EBML 0x1a45dfa3

0
nestegg/test/test.c → third_party/nestegg/test/test.c vendored
View File

2
webmdec.c
View File

@ -12,7 +12,7 @@
#include <stdarg.h> #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) { static int nestegg_read_cb(void *buffer, size_t length, void *userdata) {
FILE *f = userdata; FILE *f = userdata;