ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-11-21 19:15:28 +01:00
commit 6a7980e2cd
11 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dct32_fixed.c
View File

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

2
libavcodec/dct32_float.c
View File

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

0
libavcodec/dct32.c → libavcodec/dct32_template.c
View File

2
libavcodec/fft_fixed.c
View File

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

2
libavcodec/fft_fixed_32.c
View File

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

2
libavcodec/fft_float.c
View File

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

0
libavcodec/fft.c → libavcodec/fft_template.c
View File

2
libavcodec/mdct_fixed.c
View File

@ -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)

2
libavcodec/mdct_fixed_32.c
View File

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

2
libavcodec/mdct_float.c
View File

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

0
libavcodec/mdct.c → libavcodec/mdct_template.c
View File