xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'

Browse Source 
* commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3':
  Rename CONFIG_FFT_FLOAT ---> FFT_FLOAT

Conflicts:
	libavcodec/fft-internal.h
	libavcodec/fft-test.c
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/fft_template.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-07 13:04:09 +01:00
parent 2503928a2f 794fcf79a8
commit 7778979f6f
16 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/fft_float.c
+1 -1
View File
@@ -16,6 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define CONFIG_FFT_FLOAT 1
#define FFT_FLOAT 1
#define CONFIG_FFT_FIXED_32 0
#include "fft_template.c"