aboutsummaryrefslogtreecommitdiff
path: root/talk/app/webrtc/videotrack.cc
diff options
context:
space:
mode:
authordeadbeef <deadbeef@webrtc.org>2015-10-26 14:11:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-26 21:11:25 +0000
commit8f46c63f6f764254892f4111b54aa1cc8f32eeeb (patch)
tree0034f9c0af4685a5012796b4ec0f0fab4b991203 /talk/app/webrtc/videotrack.cc
parentaed571f6fbffa60326698b1d0aa2931a69010720 (diff)
downloadwebrtc-8f46c63f6f764254892f4111b54aa1cc8f32eeeb.tar.gz
Revert of Adding the ability to create an RtpSender without a track. (patchset #8 id:140001 of https://codereview.webrtc.org/1413713003/ )
Reason for revert: Causing a compiler warning, and causing WebRtcBrowserTest.CallAndModifyStream to fail. Original issue's description: > Adding the ability to create an RtpSender without a track. > > This CL also changes AddStream to immediately create a sender, rather > than waiting until the track is seen in SDP. And the PeerConnection now > builds the list of "send streams" from the list of senders, rather than > the collection of local media streams. > > Committed: https://crrev.com/ac9d92ccbe2b29590c53f702e11dc625820480d5 > Cr-Commit-Position: refs/heads/master@{#10414} TBR=pthatcher@webrtc.org,pthatcher@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1426443007 Cr-Commit-Position: refs/heads/master@{#10417}
Diffstat (limited to 'talk/app/webrtc/videotrack.cc')
-rw-r--r--talk/app/webrtc/videotrack.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/talk/app/webrtc/videotrack.cc b/talk/app/webrtc/videotrack.cc
index 322273579b..7c78aea91f 100644
--- a/talk/app/webrtc/videotrack.cc
+++ b/talk/app/webrtc/videotrack.cc
@@ -31,7 +31,7 @@
namespace webrtc {
-const char MediaStreamTrackInterface::kVideoTrackKind[] = "video";
+static const char kVideoTrackKind[] = "video";
VideoTrack::VideoTrack(const std::string& label,
VideoSourceInterface* video_source)