From 73452e96eecf1b013a77fcd2f814a30cfcce9f5e Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 13 Nov 2018 08:49:13 -0500 Subject: [PATCH] lib-src/libsndfile: fix warnings about bit-shifting negative constant --- lib-src/libsndfile/src/GSM610/short_term.c | 2 +- lib-src/libsndfile/src/ima_oki_adpcm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-src/libsndfile/src/GSM610/short_term.c b/lib-src/libsndfile/src/GSM610/short_term.c index 904856318..1dcffac61 100644 --- a/lib-src/libsndfile/src/GSM610/short_term.c +++ b/lib-src/libsndfile/src/GSM610/short_term.c @@ -47,7 +47,7 @@ static void Decoding_of_the_coded_Log_Area_Ratios ( #undef STEP #define STEP( B, MIC, INVA ) \ temp1 = GSM_ADD( *LARc++, MIC ) << 10; \ - temp1 = GSM_SUB( temp1, B << 1 ); \ + temp1 = GSM_SUB( temp1, B * 2 ); \ temp1 = GSM_MULT_R( INVA, temp1 ); \ *LARpp++ = GSM_ADD( temp1, temp1 ); diff --git a/lib-src/libsndfile/src/ima_oki_adpcm.c b/lib-src/libsndfile/src/ima_oki_adpcm.c index 399d2e4ac..4eea3af2a 100644 --- a/lib-src/libsndfile/src/ima_oki_adpcm.c +++ b/lib-src/libsndfile/src/ima_oki_adpcm.c @@ -63,7 +63,7 @@ ima_oki_adpcm_init (IMA_OKI_ADPCM * state, IMA_OKI_ADPCM_TYPE type) else { state->max_step_index = ARRAY_LEN (oki_steps) - 1 ; state->steps = oki_steps ; - state->mask = (~0) << 4 ; + state->mask = (~0u) << 4 ; } ; } /* ima_oki_adpcm_init */