xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent c0caf7e814 ac0e03bab0
commit 6a7980e2cd
11 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/fft_float.c
+1 -1
View File
@@ -18,4 +18,4 @@
#define CONFIG_FFT_FLOAT 1
#define CONFIG_FFT_FIXED_32 0
#include "fft.c"
#include "fft_template.c"