summaryrefslogtreecommitdiff
path: root/libavcodec/vorbisdec.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-05-19 18:57:52 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-05-19 22:56:37 +0200
commit36f10380043c8b8c5cbf8c1add8695089cdaa341 (patch)
tree3eb9c1d14a6b354a3a5b5d57388608e8f1250e4c /libavcodec/vorbisdec.c
parent98186578a2a21af5bfe6dd71d222dc270f763c7d (diff)
vorbis: use normal integer values for iterators
No need to use fixed-size integers.
Diffstat (limited to 'libavcodec/vorbisdec.c')
-rw-r--r--libavcodec/vorbisdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 60c7192bc9..718f7607a2 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -1306,7 +1306,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;
@@ -1346,10 +1346,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)
@@ -1371,7 +1371,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