Merge branch 'master' into dev_multicall

[linphone] / coreapi / linphonecore.c

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 277cbf13dcb773d844eca2da83bc850c611ec2bb..6e0221ccb75faca895311306934d2346ded6f2a9 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2097,6 +2097,7 @@ static RtpProfile *make_profile(LinphoneCore *lc, const SalMediaDescription *md,
        RtpProfile *prof=rtp_profile_new("Call profile");
        bool_t first=TRUE;
        int remote_bw=0;
+       *used_pt=-1;
        
        for(elem=desc->payloads;elem!=NULL;elem=elem->next){
                PayloadType *pt=(PayloadType*)elem->data;
@@ -2157,7 +2158,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
        {
                const SalStreamDescription *stream=sal_media_description_find_stream(call->resultdesc,
                                                        SalProtoRtpAvp,SalAudio);
-               if (stream){
+               if (stream && stream->port!=0){
                        call->audio_profile=make_profile(lc,call->resultdesc,stream,&used_pt);
                        if (!lc->use_files){
                                MSSndCard *playcard=lc->sound_conf.lsd_card ? 
@@ -2207,7 +2208,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
                        video_preview_stop(lc->previewstream);
                        lc->previewstream=NULL;
                }
-               if (stream && (lc->video_conf.display || lc->video_conf.capture)) {
+               if (stream && stream->port!=0 && (lc->video_conf.display || lc->video_conf.capture)) {
                        const char *addr=stream->addr[0]!='\0' ? stream->addr : call->resultdesc->addr;
                        call->video_profile=make_profile(lc,call->resultdesc,stream,&used_pt);
                        video_stream_set_sent_video_size(lc->videostream,linphone_core_get_preferred_video_size(lc));
@@ -2227,6 +2228,8 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
                                stream->port+1,
                                used_pt, jitt_comp, lc->video_conf.device);
                        video_stream_set_rtcp_information(lc->videostream, cname,tool);
+               }else{
+                       ms_warning("No valid video stream defined.");
                }
        }
 #endif