[SCM] libav/experimental: vorbisdec: change a uint_fast32_t to 'unsigned', fix llvm-gcc build

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:13:25 UTC 2013


The following commit has been merged in the experimental branch:
commit c934562c1293167a35a0350358e8b76ec73a3364
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Aug 2 20:35:50 2010 +0000

    vorbisdec: change a uint_fast32_t to 'unsigned', fix llvm-gcc build
    
    Originally committed as revision 24669 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index b3cc43f..1772e55 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;
         }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list