diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-05-18 23:14:17 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-05-18 23:14:17 +0400 |
| commit | 24ed465e71124c392a4e75fbdbb3e7d231c42e5b (patch) | |
| tree | 1e5e0451b3c7ecf4b414030766619e3b3ce8a7f1 | |
| parent | 9d9bad48ab738bbdcb051a174ad24acb824fe367 (diff) | |
int vs opus_int32 consistency
| -rw-r--r-- | src/opus_demo.c | 2 | ||||
| -rw-r--r-- | src/opus_encoder.c | 4 | ||||
| -rw-r--r-- | tests/test_opus_api.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/opus_demo.c b/src/opus_demo.c index cc250561..8d0449d2 100644 --- a/src/opus_demo.c +++ b/src/opus_demo.c @@ -223,7 +223,7 @@ int main(int argc, char *argv[]) int packet_loss_perc; opus_int32 count=0, count_act=0; int k; - int skip=0; + opus_int32 skip=0; int stop=0; short *in, *out; int application=OPUS_APPLICATION_AUDIO; diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 22462f31..5d613c81 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -437,7 +437,7 @@ static opus_int32 user_bitrate_to_bitrate(OpusEncoder *st, int frame_size, int m #ifdef FIXED_POINT #define opus_encode_native opus_encode -int opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size, +opus_int32 opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size, unsigned char *data, opus_int32 out_data_bytes) #else #define opus_encode_native opus_encode_float @@ -1248,7 +1248,7 @@ opus_int32 opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_s #ifdef FIXED_POINT #ifndef DISABLE_FLOAT_API -int opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size, +opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size, unsigned char *data, opus_int32 max_data_bytes) { int i, ret; diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c index 545ef689..f94009e7 100644 --- a/tests/test_opus_api.c +++ b/tests/test_opus_api.c @@ -92,7 +92,7 @@ opus_int32 test_dec_api(void) #endif short sbuf[960*2]; int c,err; - int *nullvalue; + opus_int32 *nullvalue; nullvalue=0; cfgs=0; |