* commit '16b7328058fa600d5158c84d9cc621a134eb88bc': build: Conditionally build and run DCT test program Conflicts: libavcodec/Makefile libavcodec/dct-test.c tests/fate/libavcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '16b7328058fa600d5158c84d9cc621a134eb88bc': build: Conditionally build and run DCT test program Conflicts: libavcodec/Makefile libavcodec/dct-test.c tests/fate/libavcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>