talk/app/webrtc/webrtcsdp.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/webrtcsdp.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/app/webrtc/videotrackrenderers.cc ('k') | talk/app/webrtc/webrtcsdp_unittest.cc » ('j') | webrtc/media/base/cryptoparams.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/webrtcsdp.cc

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

index e287e909162ec6c6a70e5ce454a2fb1a8d2f0403..141ada9d6aca5d28c51e360cad1a312f56dc268a 100644

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

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

@@ -27,29 +27,29 @@

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

+#include <ctype.h>

#include <limits.h>

#include <stdio.h>

#include <algorithm>

#include <string>

#include <vector>

-#include <ctype.h>

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

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

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

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

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

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

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

-#include "webrtc/p2p/base/candidate.h"

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

-#include "webrtc/p2p/base/port.h"

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

#include "webrtc/base/arraysize.h"

#include "webrtc/base/common.h"

#include "webrtc/base/logging.h"

#include "webrtc/base/messagedigest.h"

#include "webrtc/base/stringutils.h"

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

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

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

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

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

+#include "webrtc/p2p/base/candidate.h"

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

+#include "webrtc/p2p/base/port.h"

using cricket::AudioContentDescription;

using cricket::Candidate;