diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-08-02 20:35:50 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-08-02 20:35:50 +0000 |
| commit | c934562c1293167a35a0350358e8b76ec73a3364 (patch) | |
| tree | e029c2dacb86f79f16682962be048a01eccdc498 /libavcodec | |
| parent | 827d43bb9d439254eff5fa44b9809d263fbdc3cf (diff) | |
vorbisdec: change a uint_fast32_t to 'unsigned', fix llvm-gcc build
Originally committed as revision 24669 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vorbis_dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index b3cc43fca4..1772e5525b 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -97,7 +97,7 @@ typedef struct { uint_fast16_t type; uint_fast32_t begin; uint_fast32_t end; - uint_fast32_t partition_size; + unsigned partition_size; uint_fast8_t classifications; uint_fast8_t classbook; int_fast16_t books[64][8]; @@ -655,7 +655,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) if (res_setup->begin>res_setup->end || res_setup->end > vc->avccontext->channels * vc->blocksize[1] / (res_setup->type == 2 ? 1 : 2) || (res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) { - av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2); + av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %u, %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2); return -1; } |