content/renderer/pepper/pepper_media_stream_video_track_host.cc - Issue 429113002: Webrtc deps roll.

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: content/renderer/pepper/pepper_media_stream_video_track_host.cc

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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: content/renderer/pepper/pepper_media_stream_video_track_host.cc

diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc

index 604d827794c0818ef99b8b5f8217498b69e7886b..318965e6a2f9584d0ec25ef838abed157c84cbef 100644

--- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc

+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc

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

#include "ppapi/shared_impl/media_stream_buffer.h"

// IS_ALIGNED is also defined in

-// third_party/libjingle/overrides/talk/base/basictypes.h

+// third_party/webrtc/overrides/webrtc/base/basictypes.h

// TODO(ronghuawu): Avoid undef.

#undef IS_ALIGNED

#include "third_party/libyuv/include/libyuv.h"

« no previous file with comments | « content/renderer/p2p/socket_client_impl.cc ('k') | jingle/glue/DEPS » ('j') | no next file with comments »