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