[FFmpeg-cvslog] Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  7 13:04:09 2014 +0100| [7778979f6f9c863430bbf8335e7a67e875a30513] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7778979f6f9c863430bbf8335e7a67e875a30513
---