From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 24 May 2013 08:17:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dev_opus'
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=5e44a244beb610354325046afd1c9694275af241;hp=7cb2aa2639fd6180e8996eee303cfbbcb3048941

Merge remote-tracking branch 'origin/dev_opus'
---

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index f6064016..f4e5536e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -825,6 +825,7 @@ typedef struct codec_desc{
 }codec_desc_t;
 
 static codec_desc_t codec_pref_order[]={
+	{"opus", 48000},
 	{"SILK", 16000},
 	{"speex", 16000},
 	{"speex", 8000},
@@ -1287,6 +1288,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 	linphone_core_assign_payload_type(lc,&payload_type_g729,18,"annexb=no");
 	linphone_core_assign_payload_type(lc,&payload_type_aaceld_22k,-1,"config=F8EE2000; constantDuration=512;  indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5");
 	linphone_core_assign_payload_type(lc,&payload_type_aaceld_44k,-1,"config=F8E82000; constantDuration=512;  indexDeltaLength=3; indexLength=3; mode=AAC-hbr; profile-level-id=76; sizeLength=13; streamType=5");
+	linphone_core_assign_payload_type(lc,&payload_type_opus,-1,NULL);
 	linphone_core_handle_static_payloads(lc);
 	
 	ms_init();