* commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce': dct-test: Move arch-specific bits into arch-specific subdirectories Conflicts: libavcodec/dct-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>