]> sjero.net Git - linphone/commitdiff
Merge branch 'master' into dev_multicall
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 2 Jun 2010 15:58:46 +0000 (17:58 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 2 Jun 2010 15:58:46 +0000 (17:58 +0200)
Conflicts:
mediastreamer2

1  2 
coreapi/linphonecore.c

index 277cbf13dcb773d844eca2da83bc850c611ec2bb,73c3bdc2b6fa097f37095c82e1404eec04490edb..6e0221ccb75faca895311306934d2346ded6f2a9
@@@ -2157,11 -2238,10 +2158,11 @@@ void linphone_core_start_media_streams(
        {
                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.play_sndcard;
 +                              MSSndCard *playcard=lc->sound_conf.lsd_card ? 
 +                                      lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
                                MSSndCard *captcard=lc->sound_conf.capt_sndcard;
                                if (playcard==NULL) {
                                        ms_warning("No card defined for playback !");