diff options
| author | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2008-05-27 17:01:33 +0400 |
|---|---|---|
| committer | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2008-05-27 17:01:33 +0400 |
| commit | 54295e7c1b0e0c8b3ff5df3c08c4d2fdf641d008 (patch) | |
| tree | 72aabd715b9cc2fc1044f44f2878c4596b6a4965 | |
| parent | 3ea24daa971f5aa64f522c4d5a30988e35cf55bc (diff) | |
Fix to FFTW3 patch by Thorvald Natvig
git-svn-id: http://svn.xiph.org/trunk/speex@14967 0101bb08-14d6-0310-b084-bc0e0c8e3800
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libspeex/fftwrap.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0134c67..84d5091 100644 --- a/configure.ac +++ b/configure.ac @@ -110,10 +110,13 @@ CFLAGS="$SAVE_CFLAGS" ) AC_MSG_RESULT($has_visibility) -AC_ARG_WITH([gpl-fftw3], [AS_HELP_STRING([--with-gpl-fftw3],[enable experimental support for FFTW3 library for FFT])],[],[with_fftw3=no]) +AC_ARG_WITH([gpl-fftw3], [AS_HELP_STRING([--with-gpl-fftw3@<:@=PATH@:>@],[enable experimental support for FFTW3 library for FFT. @<:@default=no@:>@])],[],[with_gpl_fftw3=no]) -AS_IF([test "x$with_fftw3" != "xno"], - [PKG_CHECK_MODULES(FFTW3, fftw3f, [ +AS_IF([test "x$with_gpl_fftw3" != "xno"], + [if test "x$with_gpl_fftw3" != "xyes"; then + export PKG_CONFIG_PATH=$with_gpl_fftw3:$with_gpl_fftw3/lib/pkgconfig:$PKG_CONFIG_PATH + fi + PKG_CHECK_MODULES(FFTW3, fftw3f, [ AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT]) AC_SUBST([FFTW3_PKGCONFIG], [fftw3f]) ]]) diff --git a/libspeex/fftwrap.c b/libspeex/fftwrap.c index 37d8fae..e4e80cf 100644 --- a/libspeex/fftwrap.c +++ b/libspeex/fftwrap.c @@ -201,6 +201,7 @@ void spx_ifft(void *table, spx_word16_t *in, spx_word16_t *out) iptr[1] = 0.0f; for(i=1;i<N;++i) iptr[i+1] = in[i]; + iptr[N+1] = 0.0f; fftwf_execute(t->ifft); |