diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 19:28:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 19:28:04 +0400 |
| commit | cf4515ecd985aab899f24a6b7d18432001e670fa (patch) | |
| tree | 044e03a1909155a1f27871371b0043c2baa758ed /libavcodec/vorbis.h | |
| parent | 6ea8a830e8f1eee465174c479840b18b4963d43d (diff) | |
| parent | ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3 (diff) | |
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/vorbis.h')
| -rw-r--r-- | libavcodec/vorbis.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index 0bab0b9c0f..a8309241c2 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -43,7 +43,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, uint16_t *y_list, int *flag, int multiplier, float * out, int samples); -void ff_vorbis_inverse_coupling(float *mag, float *ang, int blocksize); +void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize); #define ilog(i) av_log2(2*(i)) |