diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-10-04 22:07:52 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-10-05 00:09:00 -0400 |
| commit | 386883179a68467ec35dd1c481100ad5915081f0 (patch) | |
| tree | 66eec7a977ae7b38f997b94561b1e6084fa9fc67 /src | |
| parent | ae5f5cc1c5d9919cc66efec2eea97f673228da44 (diff) | |
| download | libopus-386883179a68467ec35dd1c481100ad5915081f0.tar.gz | |
Fixing some opus_int vs opus_int32 mismatches
Reported by Mark Warner.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opus_decoder.c | 2 | ||||
| -rw-r--r-- | src/opus_demo.c | 2 | ||||
| -rw-r--r-- | src/opus_multistream_decoder.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/opus_decoder.c b/src/opus_decoder.c index af46d82f..149ae7f2 100644 --- a/src/opus_decoder.c +++ b/src/opus_decoder.c @@ -891,7 +891,7 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...) break; case OPUS_GET_LAST_PACKET_DURATION_REQUEST: { - opus_uint32 *value = va_arg(ap, opus_uint32*); + opus_int32 *value = va_arg(ap, opus_int32*); if (!value) { goto bad_arg; diff --git a/src/opus_demo.c b/src/opus_demo.c index a330bb54..c8135c2e 100644 --- a/src/opus_demo.c +++ b/src/opus_demo.c @@ -765,7 +765,7 @@ int main(int argc, char *argv[]) } tot_samples += nb_encoded; } else { - int output_samples; + opus_int32 output_samples; lost = len[toggle]==0 || (packet_loss_perc>0 && rand()%100 < packet_loss_perc); if (lost) opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(&output_samples)); diff --git a/src/opus_multistream_decoder.c b/src/opus_multistream_decoder.c index 30cc54b2..e421726f 100644 --- a/src/opus_multistream_decoder.c +++ b/src/opus_multistream_decoder.c @@ -237,7 +237,8 @@ static int opus_multistream_decode_native( for (s=0;s<st->layout.nb_streams;s++) { OpusDecoder *dec; - int packet_offset, ret; + opus_int32 packet_offset; + int ret; dec = (OpusDecoder*)ptr; ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size); |