Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 12:04:09 +0000 (13:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 12:10:56 +0000 (13:10 +0100)
commit7778979f6f9c863430bbf8335e7a67e875a30513
tree7fa1b50af5095e117b7c60644281522bd0379650
parent2503928a2f8ba80f3988344faf430d4ad54fbf27
parent794fcf79a89eca2d4e889803b2c804a0b1defbb3
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>
16 files changed:
libavcodec/ac3enc_fixed.c
libavcodec/arm/fft_fixed_init_arm.c
libavcodec/cos_tablegen.c
libavcodec/fft-fixed-test.c
libavcodec/fft-fixed32-test.c
libavcodec/fft-internal.h
libavcodec/fft-test.c
libavcodec/fft.h
libavcodec/fft_fixed.c
libavcodec/fft_fixed_32.c
libavcodec/fft_float.c
libavcodec/fft_template.c
libavcodec/mdct_fixed.c
libavcodec/mdct_fixed_32.c
libavcodec/mdct_float.c
libavcodec/mdct_template.c