* commit '62139b14e621f096d0f8ed90920d042b92867e40': fate: Specify the idct to use for the aic-oddsize test Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>