Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 15:28:04 +0000 (16:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 15:28:04 +0000 (16:28 +0100)
commitcf4515ecd985aab899f24a6b7d18432001e670fa
tree044e03a1909155a1f27871371b0043c2baa758ed
parent6ea8a830e8f1eee465174c479840b18b4963d43d
parentce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3
Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
  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>
libavcodec/arm/vorbisdsp_init_arm.c
libavcodec/ppc/vorbisdsp_altivec.c
libavcodec/vorbis.h
libavcodec/vorbisdec.c
libavcodec/vorbisdsp.h
libavcodec/wmv2enc.c
libavcodec/x86/vorbisdsp_init.c
tests/fate-run.sh
tests/fate/vcodec.mak