From: Automerge Script <automerge@asterisk.org>
Date: Thu, 5 Jul 2007 23:27:07 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.21-netsec~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=badfa8a03eb819525d227b19c1f0a89bae9bb965;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@73597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f62f77fb40..c39339c914 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4535,6 +4535,9 @@ static void add_codec_to_sdp(const struct sip_pvt *p, int codec, int sample_rate
 	if (codec == AST_FORMAT_G729A)
 		/* Indicate that we don't support VAD (G.729 annex B) */
 		ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no\r\n", rtp_code);
+	else if (codec == AST_FORMAT_G723_1)
+		/* Indicate that we don't support VAD (G.723.1 annex A) */
+		ast_build_string(a_buf, a_size, "a=fmtp:%d annexa=no\r\n", rtp_code);
 }
 
 static void add_noncodec_to_sdp(const struct sip_pvt *p, int format, int sample_rate,