[FFmpeg-cvslog] Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  4 19:05:28 2015 +0100| [1c9f2ebdcd073a0f23c32c237182c4c81d91056a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c9f2ebdcd073a0f23c32c237182c4c81d91056a
---