diff options
author | Mark Harris <mark.hsj@gmail.com> | 2016-12-22 11:11:32 -0800 |
---|---|---|
committer | Mark Harris <mark.hsj@gmail.com> | 2016-12-22 11:11:32 -0800 |
commit | efcdeb9bb286882743aeeb8661c088187e315262 (patch) | |
tree | 0f4bab911b0b1f6b71ba4b7029dd53e5e20669c8 | |
parent | cf9409fe51fa425d176e74c2e3bc4b7a9b5e9086 (diff) | |
download | opus-efcdeb9bb286882743aeeb8661c088187e315262.tar.gz |
Fix some compiler warnings
-rw-r--r-- | celt/mips/vq_mipsr1.h | 3 | ||||
-rw-r--r-- | silk/mips/sigproc_fix_mipsr1.h | 5 | ||||
-rw-r--r-- | src/opus_encoder.c | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/celt/mips/vq_mipsr1.h b/celt/mips/vq_mipsr1.h index 54cef861..fd18eab7 100644 --- a/celt/mips/vq_mipsr1.h +++ b/celt/mips/vq_mipsr1.h @@ -36,9 +36,6 @@ #include "mathops.h" #include "arch.h" -static unsigned extract_collapse_mask(int *iy, int N, int B); -static void normalise_residual(int * OPUS_RESTRICT iy, celt_norm * OPUS_RESTRICT X, int N, opus_val32 Ryy, opus_val16 gain); -static void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread); static void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch); #define OVERRIDE_vq_exp_rotation1 diff --git a/silk/mips/sigproc_fix_mipsr1.h b/silk/mips/sigproc_fix_mipsr1.h index 3b0a6953..51520c0a 100644 --- a/silk/mips/sigproc_fix_mipsr1.h +++ b/silk/mips/sigproc_fix_mipsr1.h @@ -28,11 +28,6 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_SIGPROC_FIX_MIPSR1_H #define SILK_SIGPROC_FIX_MIPSR1_H -#ifdef __cplusplus -extern "C" -{ -#endif - #undef silk_SAT16 static inline short int silk_SAT16(int a) { diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 665d208d..11558e87 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -1136,6 +1136,10 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ #else (void)analysis_pcm; (void)analysis_size; + (void)c1; + (void)c2; + (void)analysis_channels; + (void)downmix; #endif #ifndef DISABLE_FLOAT_API |