source/libvpx/third_party/nestegg/0001-include-paths.diff - Issue 341293003: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/third_party/nestegg/0001-include-paths.diff

Issue 341293003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « source/libvpx/third_party/libyuv/source/scale_win.cc ('k') | source/libvpx/third_party/nestegg/0002-ne_read_simple-uninitialized_variable.diff » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: source/libvpx/third_party/nestegg/0001-include-paths.diff

===================================================================

--- source/libvpx/third_party/nestegg/0001-include-paths.diff (revision 278778)

+++ source/libvpx/third_party/nestegg/0001-include-paths.diff (working copy)

@@ -1,41 +0,0 @@

-diff --git a/nestegg/halloc/src/halloc.c b/nestegg/halloc/src/halloc.c

-index 5758fc0..837b3ff 100644

---- a/nestegg/halloc/src/halloc.c

-+++ b/nestegg/halloc/src/halloc.c

-@@ -15,7 +15,7 @@

- #include <stdlib.h> /* realloc */

- #include <string.h> /* memset & co */

--#include "halloc.h"

-+#include "third_party/nestegg/halloc/halloc.h"

- #include "align.h"

- #include "hlist.h"

-diff --git a/nestegg/include/nestegg/nestegg.h b/nestegg/include/nestegg/nestegg.h

-index ff13728..c18d1d3 100644

---- a/nestegg/include/nestegg/nestegg.h

-+++ b/nestegg/include/nestegg/nestegg.h

-@@ -7,7 +7,7 @@

- #if !defined(NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79)

- #define NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79

--#include <nestegg/nestegg-stdint.h>

-+#include "vpx/vpx_integer.h"

- #if defined(__cplusplus)

- extern "C" {

-diff --git a/nestegg/src/nestegg.c b/nestegg/src/nestegg.c

-index daf1eed..4fb10e7 100644

---- a/nestegg/src/nestegg.c

-+++ b/nestegg/src/nestegg.c

-@@ -8,8 +8,8 @@

- #include <stdlib.h>

- #include <string.h>

--#include "halloc.h"

--#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