diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:28:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:28:04 +0100 |
commit | cf4515ecd985aab899f24a6b7d18432001e670fa (patch) | |
tree | 044e03a1909155a1f27871371b0043c2baa758ed /libavcodec/ppc | |
parent | 6ea8a830e8f1eee465174c479840b18b4963d43d (diff) | |
parent | ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3 (diff) | |
download | ffmpeg-streaming-cf4515ecd985aab899f24a6b7d18432001e670fa.zip ffmpeg-streaming-cf4515ecd985aab899f24a6b7d18432001e670fa.tar.gz |
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>
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r-- | libavcodec/ppc/vorbisdsp_altivec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index 4043403..cff881f 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -27,7 +27,7 @@ #if HAVE_ALTIVEC static void vorbis_inverse_coupling_altivec(float *mag, float *ang, - int blocksize) + intptr_t blocksize) { int i; vector float m, a; |