generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Review URL: http://webrtc-codereview.appspot.com/118001

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@406 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org 2011-08-19 16:39:18 +00:00
parent 412889a2a9
commit bca7fa09af
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
View File

@ -523,21 +523,6 @@ bool WebRtcSession::OnRemoteDescription(
return true;
}
<<<<<<< .mine
=======
void WebRtcSession::ProcessTerminateAccept(cricket::SessionDescription* desc) {
const cricket::ContentInfo* video_content = GetFirstVideoContent(desc);
if (video_content) {
SignalRemoveStream(video_content->name, true);
} else {
const cricket::ContentInfo* audio_content = GetFirstAudioContent(desc);
if (audio_content) {
SignalRemoveStream(audio_content->name, false);
}
}
}
>>>>>>> .r402
bool WebRtcSession::CheckForStreamDeleteMessage(
const std::vector<cricket::Candidate>& candidates) {
for (size_t i = 0; i < candidates.size(); ++i) {