
* commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>