[FFmpeg-cvslog] Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 22 13:59:13 2013 +0100| [eb2f499e37ee8c890836f80c3ffba57e971fe514] | committer: Michael Niedermayer

Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

* commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6':
  Revert "fate: Use wmv2 IDCT for wmv2 tests"

Conflicts:
	tests/fate-run.sh
	tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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