From: Joshua Colp <jcolp@digium.com>
Date: Wed, 27 Jun 2007 22:58:53 +0000 (+0000)
Subject: Merged revisions 72331 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4897378ff10fad51192f396816ab3f1910d3a245;p=thirdparty%2Fasterisk.git

Merged revisions 72331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72331 | file | 2007-06-27 18:58:02 -0400 (Wed, 27 Jun 2007) | 2 lines

Make payload IDs for iLBC/Speex match to our list. Since these are dynamic payloads the other side shouldn't care. (issue #9426 reported by irroot)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 18686e15c0..bd53d7ae03 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -355,7 +355,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, int codec, iks *dcodec
 			ast_log(LOG_WARNING,"Failed to allocate iks node");
 			return -1;
 		}
-		iks_insert_attrib(payload_ilbc, "id", "102");
+		iks_insert_attrib(payload_ilbc, "id", "97");
 		iks_insert_attrib(payload_ilbc, "name", "iLBC");
 		iks_insert_attrib(payload_ilbc, "clockrate","8000");
 		iks_insert_attrib(payload_ilbc, "bitrate","13300");
@@ -379,7 +379,7 @@ static int add_codec_to_answer(const struct gtalk_pvt *p, int codec, iks *dcodec
 			ast_log(LOG_WARNING,"Failed to allocate iks node");
 			return -1;
 		}
-		iks_insert_attrib(payload_speex, "id", "98");
+		iks_insert_attrib(payload_speex, "id", "110");
 		iks_insert_attrib(payload_speex, "name", "speex");
 		iks_insert_attrib(payload_speex, "clockrate","8000");
 		iks_insert_attrib(payload_speex, "bitrate","11000");