Merged revisions 292413 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292413 | pabelanger | 2010-10-20 20:07:17 -0400 (Wed, 20 Oct 2010) | 24 lines
  
  Merged revisions 292412 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r292412 | pabelanger | 2010-10-20 20:05:45 -0400 (Wed, 20 Oct 2010) | 17 lines
    
    Merged revisions 292411 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r292411 | pabelanger | 2010-10-20 20:00:51 -0400 (Wed, 20 Oct 2010) | 10 lines
      
      Record priv-recordintro as sln, not gsm
      
      This removes the gsm->sln step when transcoding
      priv-recordintro.
      
      (closes issue #18176)
      Reported by: pabelanger
      Patches: 
            chan_sip.diff uploaded by pabelanger (license 224)
    ........
  ................
................


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

apps/app_dial.c

@@ -1695,7 +1695,7 @@ static int setup_privacy_args(struct privacy_args *pa,
 			*/
 			silencethreshold = ast_dsp_get_threshold_from_settings(THRESHOLD_SILENCE);
 			ast_answer(chan);
-			res = ast_play_and_record(chan, "priv-recordintro", pa->privintro, 4, "gsm", &duration, silencethreshold, 2000, 0);  /* NOTE: I've reduced the total time to 4 sec */
+			res = ast_play_and_record(chan, "priv-recordintro", pa->privintro, 4, "sln", &duration, silencethreshold, 2000, 0);  /* NOTE: I've reduced the total time to 4 sec */
 									/* don't think we'll need a lock removed, we took care of
 									   conflicts by naming the pa.privintro file */
 			if (res == -1) {