Michael Niedermayer 7778979f6f Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3' ...

* 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>

2014-01-07 13:10:56 +01:00

2.4 KiB

Raw Blame History

View Raw