diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:15:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:26:01 +0100 |
| commit | 6a7980e2cd4ba094756215df9172aad87cb1c469 (patch) | |
| tree | 91c874731ae44848e7c1f85317e3c30fc322eb75 | |
| parent | c0caf7e81493f5d9d4acd013892b651ab39be450 (diff) | |
| parent | ac0e03bab00182f845cd02d458f404ee30ef0998 (diff) | |
| download | ffmpeg-6a7980e2cd4ba094756215df9172aad87cb1c469.tar.gz | |
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>
| -rw-r--r-- | libavcodec/dct32_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/dct32_float.c | 2 | ||||
| -rw-r--r-- | libavcodec/dct32_template.c (renamed from libavcodec/dct32.c) | 0 | ||||
| -rw-r--r-- | libavcodec/fft_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/fft_fixed_32.c | 2 | ||||
| -rw-r--r-- | libavcodec/fft_float.c | 2 | ||||
| -rw-r--r-- | libavcodec/fft_template.c (renamed from libavcodec/fft.c) | 0 | ||||
| -rw-r--r-- | libavcodec/mdct_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/mdct_fixed_32.c | 2 | ||||
| -rw-r--r-- | libavcodec/mdct_float.c | 2 | ||||
| -rw-r--r-- | libavcodec/mdct_template.c (renamed from libavcodec/mdct.c) | 0 |
11 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/dct32_fixed.c b/libavcodec/dct32_fixed.c index 1a5528d713..9025d5efdd 100644 --- a/libavcodec/dct32_fixed.c +++ b/libavcodec/dct32_fixed.c @@ -17,4 +17,4 @@ */ #define DCT32_FLOAT 0 -#include "dct32.c" +#include "dct32_template.c" diff --git a/libavcodec/dct32_float.c b/libavcodec/dct32_float.c index 70168f5637..597c9bb639 100644 --- a/libavcodec/dct32_float.c +++ b/libavcodec/dct32_float.c @@ -17,4 +17,4 @@ */ #define DCT32_FLOAT 1 -#include "dct32.c" +#include "dct32_template.c" diff --git a/libavcodec/dct32.c b/libavcodec/dct32_template.c index fb53d53ab1..fb53d53ab1 100644 --- a/libavcodec/dct32.c +++ b/libavcodec/dct32_template.c diff --git a/libavcodec/fft_fixed.c b/libavcodec/fft_fixed.c index 153b7d845d..9e74b8c160 100644 --- a/libavcodec/fft_fixed.c +++ b/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" diff --git a/libavcodec/fft_fixed_32.c b/libavcodec/fft_fixed_32.c index f2954d7d26..18e6da9097 100644 --- a/libavcodec/fft_fixed_32.c +++ b/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" diff --git a/libavcodec/fft_float.c b/libavcodec/fft_float.c index 011dc45904..93d36071a2 100644 --- a/libavcodec/fft_float.c +++ b/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" diff --git a/libavcodec/fft.c b/libavcodec/fft_template.c index e0cf1f2982..e0cf1f2982 100644 --- a/libavcodec/fft.c +++ b/libavcodec/fft_template.c diff --git a/libavcodec/mdct_fixed.c b/libavcodec/mdct_fixed.c index 33a266d8cb..2ee29b609a 100644 --- a/libavcodec/mdct_fixed.c +++ b/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) diff --git a/libavcodec/mdct_fixed_32.c b/libavcodec/mdct_fixed_32.c index 66226f3e69..f1d6a2dc6b 100644 --- a/libavcodec/mdct_fixed_32.c +++ b/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" diff --git a/libavcodec/mdct_float.c b/libavcodec/mdct_float.c index fec18bab36..75b5f0d3a0 100644 --- a/libavcodec/mdct_float.c +++ b/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" diff --git a/libavcodec/mdct.c b/libavcodec/mdct_template.c index 922d577e3e..922d577e3e 100644 --- a/libavcodec/mdct.c +++ b/libavcodec/mdct_template.c |