Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:05:28 +0000 (19:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:05:28 +0000 (19:05 +0100)
commit1c9f2ebdcd073a0f23c32c237182c4c81d91056a
tree565e4064d0857c9c6b4609bdbd12513f9961f40a
parentec5a4af560aafd67c80fe1c80af879d4c4cdaa63
parent62139b14e621f096d0f8ed90920d042b92867e40
Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'

* 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>
tests/fate/video.mak