diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 13:04:09 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 13:10:56 +0100 |
commit | 7778979f6f9c863430bbf8335e7a67e875a30513 (patch) | |
tree | 7fa1b50af5095e117b7c60644281522bd0379650 /libavformat/movenchint.c | |
parent | 2503928a2f8ba80f3988344faf430d4ad54fbf27 (diff) | |
parent | 794fcf79a89eca2d4e889803b2c804a0b1defbb3 (diff) |
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>
Diffstat (limited to 'libavformat/movenchint.c')
0 files changed, 0 insertions, 0 deletions