Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dct/fft: Give consistent names to fixed/float template files

Conflicts:
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/dct32_fixed.c

@@ -17,4 +17,4 @@
  */
 
 #define DCT32_FLOAT 0
-#include "dct32.c"
+#include "dct32_template.c"

libavcodec/dct32_float.c

@@ -17,4 +17,4 @@
  */
 
 #define DCT32_FLOAT 1
-#include "dct32.c"
+#include "dct32_template.c"

libavcodec/fft_fixed.c

@@ -18,4 +18,4 @@
 
 #define CONFIG_FFT_FLOAT 0
 #define CONFIG_FFT_FIXED_32 0
-#include "fft.c"
+#include "fft_template.c"

libavcodec/fft_fixed_32.c

@@ -49,4 +49,4 @@
 
 #define CONFIG_FFT_FLOAT 0
 #define CONFIG_FFT_FIXED_32 1
-#include "fft.c"
+#include "fft_template.c"

libavcodec/fft_float.c

@@ -18,4 +18,4 @@
 
 #define CONFIG_FFT_FLOAT 1
 #define CONFIG_FFT_FIXED_32 0
-#include "fft.c"
+#include "fft_template.c"

libavcodec/mdct_fixed.c

@@ -18,7 +18,7 @@
 
 #define CONFIG_FFT_FLOAT 0
 #define CONFIG_FFT_FIXED_32 0
-#include "mdct.c"
+#include "mdct_template.c"
 
 /* same as ff_mdct_calcw_c with double-width unscaled output */
 void ff_mdct_calcw_c(FFTContext *s, FFTDouble *out, const FFTSample *input)

libavcodec/mdct_fixed_32.c

@@ -49,4 +49,4 @@
 
 #define CONFIG_FFT_FLOAT 0
 #define CONFIG_FFT_FIXED_32 1
-#include "mdct.c"
+#include "mdct_template.c"

libavcodec/mdct_float.c

@@ -18,4 +18,4 @@
 
 #define CONFIG_FFT_FLOAT 1
 #define CONFIG_FFT_FIXED_32 0
-#include "mdct.c"
+#include "mdct_template.c"