zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A followup to r6828 to fix a condition check in mediasession.cc.

Browse Source 
BUG=2395
R=juberti@chromium.org, juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17029004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6832 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-08-05 23:52:36 +00:00
parent d7b4dea801
commit 56d8e05238
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
talk/session/media/mediasession.cc
View File

@ -1185,8 +1185,8 @@ SessionDescription* MediaSessionDescriptionFactory::CreateOffer(
return NULL;
}
video_added = true;
} else if (options.has_data()) {
ASSERT(IsMediaContentOfType(&*it, MEDIA_TYPE_DATA));
} else if (IsMediaContentOfType(&*it, MEDIA_TYPE_DATA) &&
options.has_data()) {
if (!AddDataContentForOffer(options, current_description, &data_codecs,
&current_streams, offer.get())) {
return NULL;