Merge commit '531f9c8'

diff --combined coreapi/linphonecore.c
index 8a7140fb529eb56a89ef3e5a744d11796a875971,86a13f52bde01fa9fc927dcd1936da7c31a48386..9ddc77c6b5c711fef205d5bd50822ac821bfba61
--- 1/coreapi/linphonecore.c
--- 2/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@@ -435,13 -435,13 +435,13 @@@ static void sound_config_read(LinphoneC
        tmpbuf=PACKAGE_SOUND_DIR "/" LOCAL_RING;
        tmpbuf=lp_config_get_string(lc->config,"sound","local_ring",tmpbuf);
        if (ortp_file_exist(tmpbuf)==-1) {
 +              ms_warning("%s does not exist",tmpbuf);
                tmpbuf=PACKAGE_SOUND_DIR "/" LOCAL_RING;
        }
        if (strstr(tmpbuf,".wav")==NULL){
                /* it currently uses old sound files, so replace them */
                tmpbuf=PACKAGE_SOUND_DIR "/" LOCAL_RING;
        }
 -
        linphone_core_set_ring(lc,tmpbuf);
  
        tmpbuf=PACKAGE_SOUND_DIR "/" REMOTE_RING;
@@@ -658,7 -658,6 +658,7 @@@ static const char *codec_pref_order[]=
        "theora",
        "H263-1998",
        "H263",
 +      "x-snow",
        NULL,
  };
  
@@@ -693,10 -692,7 +693,10 @@@ static MSList *add_missing_codecs(SalSt
                        }
                        if (pt && ms_filter_codec_supported(pt->mime_type)){
                                if (ms_list_find(l,pt)==NULL){
 -                                      payload_type_set_flag(pt,PAYLOAD_TYPE_ENABLED);
 +                                      /*do not enable old or experimental codecs by default*/
 +                                      if (strcasecmp(pt->mime_type,"H263")!=0 && strcasecmp(pt->mime_type,"x-snow")!=0){
 +                                              payload_type_set_flag(pt,PAYLOAD_TYPE_ENABLED);
 +                                      }
                                        ms_message("Adding new codec %s/%i with fmtp %s",
                                            pt->mime_type,pt->clock_rate,pt->recv_fmtp ? pt->recv_fmtp : "");
                                        l=ms_list_insert_sorted(l,pt,(int (*)(const void *, const void *))codec_compare);
@@@ -963,8 -959,7 +963,8 @@@ static void linphone_core_init (Linphon
        linphone_core_assign_payload_type(&payload_type_mp4v,99,"profile-level-id=3");
        linphone_core_assign_payload_type(&payload_type_x_snow,100,NULL);
        linphone_core_assign_payload_type(&payload_type_h264,102,"profile-level-id=428014");
 -      linphone_core_assign_payload_type(&payload_type_h264,103,"packetization-mode=1;profile-level-id=428014");
 +      /* due to limited space in SDP, we have to disable this h264 line which is normally no more necessary */
 +      /* linphone_core_assign_payload_type(&payload_type_h264,103,"packetization-mode=1;profile-level-id=428014");*/
  #endif
  
        ms_init();
@@@ -3592,11 -3587,6 +3592,6 @@@ void linphone_core_play_dtmf(LinphoneCo
                return;
        }
  
-       // Play DTMF only when in call
-       if (!linphone_core_in_call(lc)) {
-               return;
-       }
- 
        if (duration_ms>0)
                ms_filter_call_method(f, MS_DTMF_GEN_PLAY, &dtmf);
        else ms_filter_call_method(f, MS_DTMF_GEN_START, &dtmf);