* commit 'ce378f0d':
  fate: Use wmv2 IDCT for wmv2 tests
  vorbisdsp: change block_size type from int to intptr_t.

Conflicts:
	tests/fate-run.sh
	tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>