[svn-commits] alecdavis: branch 11 r371664 - in /branches/11: ./ main/dsp.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Sun Aug 26 18:07:57 2012
New Revision: 371664

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371664
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

Modified:
    branches/11/   (props changed)
    branches/11/main/dsp.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/dsp.c?view=diff&rev=371664&r1=371663&r2=371664
==============================================================================
--- branches/11/main/dsp.c (original)
+++ branches/11/main/dsp.c Sun Aug 26 18:07:57 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 */