Merged revisions 181296 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r181296 | file | 2009-03-11 13:40:48 -0300 (Wed, 11 Mar 2009) | 16 lines
  
  Merged revisions 181295 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181295 | file | 2009-03-11 13:36:50 -0300 (Wed, 11 Mar 2009) | 9 lines
    
    Fix a problem with inband DTMF detection on outgoing SIP calls when dtmfmode=auto.
    
    When dtmfmode was set to auto the inband DTMF detector was not setup
    on outgoing SIP calls. This caused inband DTMF detection to fail.
    The inband DTMF detector is now setup for both dtmfmode inband and auto.
    
    (closes issue #13713)
    Reported by: makoto
  ........
................


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

channels/chan_sip.c

@@ -5778,9 +5778,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 	else
 		ast_debug(3, "This channel will not be able to handle video.\n");
 
-
-
-	if (ast_test_flag(&i->flags[0], SIP_DTMF) ==  SIP_DTMF_INBAND) {
+	if ((ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) || (ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {
 		i->vad = ast_dsp_new();
 		ast_dsp_set_features(i->vad, DSP_FEATURE_DIGIT_DETECT);
 		if (global_relaxdtmf)