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

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

Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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/peerconnectionfactory.cc

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

index ab8fdf5b251a028313a9bb9d11aadcd35dee2407..a781eb3e2594240b67aa6e61a01e11fa9b6718e8 100644

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

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

@@ -40,10 +40,10 @@

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

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

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

-#include "talk/media/webrtc/webrtcmediaengine.h"

-#include "talk/media/webrtc/webrtcvideodecoderfactory.h"

-#include "talk/media/webrtc/webrtcvideoencoderfactory.h"

#include "webrtc/base/bind.h"

+#include "webrtc/media/webrtc/webrtcmediaengine.h"

+#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"

+#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"

#include "webrtc/modules/audio_device/include/audio_device.h"

#include "webrtc/p2p/base/basicpacketsocketfactory.h"

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