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 f62f77fb4010b2b5120f52d63a765b262f78e13f..c39339c9143878946c38ecf915b32b8504fcbc2b 100644 (file)
--- 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,