3 files changed, 15 insertions, 11 deletions

diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c
index eb0638524f..7bf7935d39 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/apps/codecs/libmusepack/mpc_decoder.c
@@ -118,13 +118,15 @@ enum
 //------------------------------------------------------------------------------
 // forward declarations
 //------------------------------------------------------------------------------
-void mpc_decoder_requantisierung   (mpc_decoder *d) 
-                                    ICODE_ATTR_MPC_LARGE_IRAM;
-void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r) 
-                                    ICODE_ATTR_MPC_LARGE_IRAM;
-void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r,
-                                    mpc_bool_t is_key_frame)
-                                    ICODE_ATTR_MPC_SV8_BS_DEC;
+static void mpc_decoder_requantisierung   (mpc_decoder *d)
+                                           ICODE_ATTR_MPC_LARGE_IRAM;
+static void mpc_decoder_read_bitstream_sv7(mpc_decoder * d,
+                                           mpc_bits_reader * r)
+                                           ICODE_ATTR_MPC_LARGE_IRAM;
+static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d,
+                                           mpc_bits_reader * r,
+                                           mpc_bool_t is_key_frame)
+                                           ICODE_ATTR_MPC_SV8_BS_DEC;
 
 //------------------------------------------------------------------------------
 // macros
@@ -348,7 +350,7 @@ void mpc_decoder_decode_frame(mpc_decoder * d,
     }
 }
 
-void
+static void
 mpc_decoder_requantisierung(mpc_decoder *d)
 {
     mpc_int32_t     Band;
@@ -431,7 +433,7 @@ mpc_decoder_requantisierung(mpc_decoder *d)
     }
 }
 
-void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r)
+static void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r)
 {
     mpc_int32_t n, idx, Max_used_Band = 0;
 
@@ -580,7 +582,7 @@ void mpc_decoder_read_bitstream_sv7(mpc_decoder * d, mpc_bits_reader * r)
     }
 }
 
-void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, mpc_bool_t is_key_frame)
+static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, mpc_bool_t is_key_frame)
 {
     mpc_int32_t n, Max_used_Band;
     const mpc_can_data * Table, * Tables[2];
diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h
index 68754dcbd2..85536e726a 100644
--- a/apps/codecs/libmusepack/mpcdec.h
+++ b/apps/codecs/libmusepack/mpcdec.h
@@ -139,7 +139,9 @@ MPC_API void mpc_decoder_exit(mpc_decoder *p_dec);
  * by this factor. Useful for applying replay gain.
  * @param scale_factor multiplicative scaling factor
  */
+/* rockbox: changed to static
 MPC_API void mpc_decoder_scale_output(mpc_decoder *p_dec, double scale_factor);
+*/
 
 MPC_API void mpc_decoder_decode_frame(mpc_decoder * d, mpc_bits_reader * r, mpc_frame_info * i);
 
diff --git a/apps/codecs/libmusepack/requant.c b/apps/codecs/libmusepack/requant.c
index ad26867204..5a113b0885 100644
--- a/apps/codecs/libmusepack/requant.c
+++ b/apps/codecs/libmusepack/requant.c
@@ -90,7 +90,7 @@ static mpc_uint32_t find_shift(double fval)
 
 #define SET_SCF(N,X) d->SCF[N] = MAKE_MPC_SAMPLE_EX(X,d->SCF_shift[N] = (mpc_uint8_t) find_shift(X));
 
-void
+static void
 mpc_decoder_scale_output(mpc_decoder *d, double factor)
 {
     mpc_int32_t n; double f1, f2;