[svn-commits] alecdavis: trunk r371665 - in /trunk: ./ main/dsp.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Sun Aug 26 18:10:30 2012
New Revision: 371665

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371665
Log:
mf_detect: incorrectly used DTMF_GSIZE instead of MF_GSIZE
........

Merged revisions 371662 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 371663 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 371664 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/dsp.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Sun Aug 26 18:10:30 2012
@@ -1,1 +1,1 @@
-/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371425-371426,371438,371482,371492,371507,371516,371518,371520,371546,371571,371592,371619
+/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371425-371426,371438,371482,371492,371507,371516,371518,371520,371546,371571,371592,371619,371664

Modified: trunk/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dsp.c?view=diff&rev=371665&r1=371664&r2=371665
==============================================================================
--- trunk/main/dsp.c (original)
+++ trunk/main/dsp.c Sun Aug 26 18:10:30 2012
@@ -918,7 +918,7 @@
 				mute_fragment(dsp, &mute);
 				mute.start = (sample > MF_GSIZE) ? (sample - MF_GSIZE) : 0;
 			}
-			mute.end = limit + DTMF_GSIZE;
+			mute.end = limit + MF_GSIZE;
 		}
 
 		/* Reinitialise the detector for the next block */