media/filters/vpx_video_decoder.cc - Issue 1323333002: Copy libvpx from DEPS to src

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: media/filters/vpx_video_decoder.cc

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: keep checklicenses exception for old directory, add exe bit to run_perl.py Created 5 years, 3 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:

Index: media/filters/vpx_video_decoder.cc

diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc

index c9e1ce11f238649e9790963587e33dc07cd63002..6fffb5f4762c85a007b8d59f4be31c90a089132f 100644

--- a/media/filters/vpx_video_decoder.cc

+++ b/media/filters/vpx_video_decoder.cc

@@ -36,9 +36,9 @@

// backwards compatibility for legacy applications using the library.

#define VPX_CODEC_DISABLE_COMPAT 1

extern "C" {

-#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"

-#include "third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h"

-#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"

+#include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h"

+#include "third_party/libvpx_new/source/libvpx/vpx/vpx_frame_buffer.h"

+#include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h"

Johann 2015/09/17 16:32:18 presubmit would like vp8 before vpx

}

namespace media {