5 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libfaad/decoder.c b/contrib/libfaad/decoder.c
index 7fb4b1965..9607f349c 100644
--- a/contrib/libfaad/decoder.c
+++ b/contrib/libfaad/decoder.c
@@ -60,7 +60,7 @@ static void* aac_frame_decode(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo,
 static void create_channel_config(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo);
 
 
-char* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode)
+const char* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode)
 {
     if (errcode >= NUM_ERROR_MESSAGES)
         return NULL;
diff --git a/contrib/libfaad/decoder.h b/contrib/libfaad/decoder.h
index a4cb567d2..b28d056b7 100644
--- a/contrib/libfaad/decoder.h
+++ b/contrib/libfaad/decoder.h
@@ -73,7 +73,7 @@ extern "C" {
 #define LFE_CHANNEL          (9)
 #define UNKNOWN_CHANNEL      (0)
 
-char* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode);
+const char* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode);
 
 uint32_t NEAACDECAPI NeAACDecGetCapabilities(void);
 
diff --git a/contrib/libfaad/error.c b/contrib/libfaad/error.c
index c552e06cd..33150eb44 100644
--- a/contrib/libfaad/error.c
+++ b/contrib/libfaad/error.c
@@ -31,7 +31,7 @@
 #include "common.h"
 #include "error.h"
 
-char *err_msg[] = {
+const char *err_msg[] = {
     "No error",
     "Gain control not yet implemented",
     "Pulse coding not allowed in short blocks",
diff --git a/contrib/libfaad/error.h b/contrib/libfaad/error.h
index 7f750217c..91ffc458e 100644
--- a/contrib/libfaad/error.h
+++ b/contrib/libfaad/error.h
@@ -36,7 +36,7 @@ extern "C" {
 #endif
 
 #define NUM_ERROR_MESSAGES 33
-extern char *err_msg[];
+extern const char *err_msg[];
 
 #ifdef __cplusplus
 }
diff --git a/contrib/libfaad/specrec.c b/contrib/libfaad/specrec.c
index ea6ca94b9..c9d5e0881 100644
--- a/contrib/libfaad/specrec.c
+++ b/contrib/libfaad/specrec.c
@@ -425,7 +425,7 @@ uint8_t window_grouping_info(NeAACDecHandle hDecoder, ic_stream *ics)
     }
 }
 
-/* iquant() *
+/* iquant() */
 /* output = sign(input)*abs(input)^(4/3) */
 /**/
 static INLINE real_t iquant(int16_t q, const real_t *tab, uint8_t *error)