Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Disable sign-compare warning on Win Clang 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:
View side-by-side diff with in-line comments
Download patch
« talk/app/webrtc/java/jni/androidmediadecoder_jni.cc ('K') | « talk/session/media/mediasession.h ('k') | talk/session/media/mediasession_unittest.cc » ('j') | webrtc/media/base/cryptoparams.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« talk/app/webrtc/java/jni/androidmediadecoder_jni.cc ('K') | « talk/session/media/mediasession.h ('k') | talk/session/media/mediasession_unittest.cc » ('j') | webrtc/media/base/cryptoparams.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698