Browse Source

Move FFT parts from dsputil.h to fft.h

Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård 15 years ago
parent
commit
1429224b04

+ 1 - 1
ffplay.c

@@ -30,7 +30,7 @@
 #include "libavcodec/audioconvert.h"
 #include "libavcodec/audioconvert.h"
 #include "libavcodec/colorspace.h"
 #include "libavcodec/colorspace.h"
 #include "libavcodec/opt.h"
 #include "libavcodec/opt.h"
-#include "libavcodec/dsputil.h"
+#include "libavcodec/fft.h"
 
 
 #if CONFIG_AVFILTER
 #if CONFIG_AVFILTER
 # include "libavfilter/avfilter.h"
 # include "libavfilter/avfilter.h"

+ 1 - 0
libavcodec/aac.c

@@ -80,6 +80,7 @@
 #include "internal.h"
 #include "internal.h"
 #include "get_bits.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dsputil.h"
+#include "fft.h"
 #include "lpc.h"
 #include "lpc.h"
 
 
 #include "aac.h"
 #include "aac.h"

+ 1 - 0
libavcodec/aac.h

@@ -32,6 +32,7 @@
 
 
 #include "avcodec.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "dsputil.h"
+#include "fft.h"
 #include "mpeg4audio.h"
 #include "mpeg4audio.h"
 
 
 #include <stdint.h>
 #include <stdint.h>

+ 1 - 0
libavcodec/ac3dec.h

@@ -31,6 +31,7 @@
 #include "ac3.h"
 #include "ac3.h"
 #include "get_bits.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dsputil.h"
+#include "fft.h"
 
 
 /* override ac3.h to include coupling channel */
 /* override ac3.h to include coupling channel */
 #undef AC3_MAX_CHANNELS
 #undef AC3_MAX_CHANNELS

+ 1 - 1
libavcodec/arm/fft_init_arm.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
  */
 
 
-#include "libavcodec/dsputil.h"
+#include "libavcodec/fft.h"
 
 
 void ff_fft_permute_neon(FFTContext *s, FFTComplex *z);
 void ff_fft_permute_neon(FFTContext *s, FFTComplex *z);
 void ff_fft_calc_neon(FFTContext *s, FFTComplex *z);
 void ff_fft_calc_neon(FFTContext *s, FFTComplex *z);

+ 1 - 0
libavcodec/atrac1.c

@@ -35,6 +35,7 @@
 #include "avcodec.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dsputil.h"
+#include "fft.h"
 
 
 #include "atrac.h"
 #include "atrac.h"
 #include "atrac1data.h"
 #include "atrac1data.h"

+ 1 - 0
libavcodec/atrac3.c

@@ -40,6 +40,7 @@
 #include "get_bits.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dsputil.h"
 #include "bytestream.h"
 #include "bytestream.h"
+#include "fft.h"
 
 
 #include "atrac.h"
 #include "atrac.h"
 #include "atrac3data.h"
 #include "atrac3data.h"

+ 2 - 0
libavcodec/binkaudio.c

@@ -32,6 +32,8 @@
 #define ALT_BITSTREAM_READER_LE
 #define ALT_BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dsputil.h"
+#include "fft.h"
+
 extern const uint16_t ff_wma_critical_freqs[25];
 extern const uint16_t ff_wma_critical_freqs[25];
 
 
 #define MAX_CHANNELS 2
 #define MAX_CHANNELS 2

+ 1 - 0
libavcodec/cook.c

@@ -52,6 +52,7 @@
 #include "get_bits.h"
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dsputil.h"
 #include "bytestream.h"
 #include "bytestream.h"
+#include "fft.h"
 
 
 #include "cookdata.h"
 #include "cookdata.h"
 
 

+ 1 - 0
libavcodec/dca.c

@@ -32,6 +32,7 @@
 
 
 #include "avcodec.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "dsputil.h"
+#include "fft.h"
 #include "get_bits.h"
 #include "get_bits.h"
 #include "put_bits.h"
 #include "put_bits.h"
 #include "dcadata.h"
 #include "dcadata.h"

Some files were not shown because too many files changed in this diff