talk/app/webrtc/peerconnection.cc - Issue 1587193006: Move talk/media to webrtc/media

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: talk/app/webrtc/peerconnection.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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: talk/app/webrtc/peerconnection.cc

diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc

index beae77097836474083ef0afec7955cdf5fe2c52f..c375e2921565acdf7ad842905f067ec5bce20115 100644

--- a/talk/app/webrtc/peerconnection.cc

+++ b/talk/app/webrtc/peerconnection.cc

@@ -48,13 +48,13 @@

#include "talk/app/webrtc/streamcollection.h"

#include "talk/app/webrtc/videosource.h"

#include "talk/app/webrtc/videotrack.h"

-#include "talk/media/sctp/sctpdataengine.h"

#include "talk/session/media/channelmanager.h"

#include "webrtc/base/arraysize.h"

#include "webrtc/base/logging.h"

#include "webrtc/base/stringencode.h"

#include "webrtc/base/stringutils.h"

#include "webrtc/base/trace_event.h"

+#include "webrtc/media/sctp/sctpdataengine.h"

#include "webrtc/p2p/client/basicportallocator.h"

#include "webrtc/system_wrappers/include/field_trial.h"