diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 11:28:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 11:28:21 +0200 |
| commit | aef044d215a54dfbc771a767afded37c6d4a34a9 (patch) | |
| tree | 7b21085a1c041334511ccb72f9f9a9e5840eedd9 | |
| parent | 6e7c534955d9bae3a6964a7ff8c35d7bf3f3bddc (diff) | |
| parent | 36f10380043c8b8c5cbf8c1add8695089cdaa341 (diff) | |
| download | ffmpeg-aef044d215a54dfbc771a767afded37c6d4a34a9.tar.gz | |
Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'
* commit '36f10380043c8b8c5cbf8c1add8695089cdaa341':
vorbis: use normal integer values for iterators
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vorbisdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index b7e676f1a0..facaf4f137 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1317,7 +1317,7 @@ static av_always_inline int setup_classifs(vorbis_context *vc, vorbis_residue *vr, uint8_t *do_not_decode, unsigned ch_used, - unsigned partition_count) + int partition_count) { int p, j, i; unsigned c_p_c = vc->codebooks[vr->classbook].dimensions; @@ -1357,10 +1357,10 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, { GetBitContext *gb = &vc->gb; unsigned c_p_c = vc->codebooks[vr->classbook].dimensions; - unsigned ptns_to_read = vr->ptns_to_read; uint8_t *classifs = vr->classifs; unsigned pass, ch_used, i, j, k, l; unsigned max_output = (ch - 1) * vlen; + int ptns_to_read = vr->ptns_to_read; if (vr_type == 2) { for (j = 1; j < ch; ++j) @@ -1382,7 +1382,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, av_dlog(NULL, " residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c); for (pass = 0; pass <= vr->maxpass; ++pass) { // FIXME OPTIMIZE? - uint16_t voffset, partition_count, j_times_ptns_to_read; + int voffset, partition_count, j_times_ptns_to_read; voffset = vr->begin; for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error |