talk/session/media/mediasession.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/session/media/mediasession.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/session/media/mediasession.cc

diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc

index 24f01b4463b5931267475fac98015a343f59cc78..b6f52c2b62155e1a8917e7073eabe1df1e810d9b 100644

--- a/talk/session/media/mediasession.cc

+++ b/talk/session/media/mediasession.cc

@@ -32,18 +32,18 @@

#include <set>

#include <utility>

-#include "talk/media/base/constants.h"

-#include "talk/media/base/cryptoparams.h"

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

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

#include "webrtc/base/helpers.h"

#include "webrtc/base/logging.h"

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/base/stringutils.h"

+#include "webrtc/media/base/constants.h"

+#include "webrtc/media/base/cryptoparams.h"

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

#ifdef HAVE_SCTP

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

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

#else

static const uint32_t kMaxSctpSid = 1023;

#endif

« no previous file with comments | « talk/session/media/mediasession.h ('k') | talk/session/media/mediasession_unittest.cc » ('j') | no next file with comments »