4 files changed, 18 insertions, 16 deletions
diff --git a/src/decoder_internal.h b/src/decoder_internal.h
index 45c104651..7a36e011c 100644
--- a/src/decoder_internal.h
+++ b/src/decoder_internal.h
@@ -23,7 +23,7 @@
 #include "pcm_utils.h"
 
 struct decoder {
-	struct decoder_plugin *plugin;
+	const struct decoder_plugin *plugin;
 
 	struct pcm_convert_state conv_state;
 
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 57a013ec9..e99f6a5fd 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -65,12 +65,12 @@ static int stringFoundInStringArray(const char *const*array, const char *suffix)
 	return 0;
 }
 
-struct decoder_plugin *decoder_plugin_from_suffix(const char *suffix,
-						  unsigned int next)
+const struct decoder_plugin *
+decoder_plugin_from_suffix(const char *suffix, unsigned int next)
 {
 	static ListNode *pos;
 	ListNode *node;
-	struct decoder_plugin *plugin;
+	const struct decoder_plugin *plugin;
 
 	if (suffix == NULL)
 		return NULL;
@@ -95,8 +95,8 @@ struct decoder_plugin *decoder_plugin_from_suffix(const char *suffix,
 	return NULL;
 }
 
-struct decoder_plugin *decoder_plugin_from_mime_type(const char *mimeType,
-						     unsigned int next)
+const struct decoder_plugin *
+decoder_plugin_from_mime_type(const char *mimeType, unsigned int next)
 {
 	static ListNode *pos;
 	ListNode *node;
@@ -119,13 +119,14 @@ struct decoder_plugin *decoder_plugin_from_mime_type(const char *mimeType,
 	return NULL;
 }
 
-struct decoder_plugin *decoder_plugin_from_name(const char *name)
+const struct decoder_plugin *
+decoder_plugin_from_name(const char *name)
 {
 	void *plugin = NULL;
 
 	findInList(inputPlugin_list, name, &plugin);
 
-	return (struct decoder_plugin *) plugin;
+	return (const struct decoder_plugin *) plugin;
 }
 
 void decoder_plugin_print_all_suffixes(FILE * fp)
diff --git a/src/decoder_list.h b/src/decoder_list.h
index ea3eb7f92..2e18438fb 100644
--- a/src/decoder_list.h
+++ b/src/decoder_list.h
@@ -24,18 +24,19 @@
 struct decoder_plugin;
 
 /* individual functions to load/unload plugins */
-void decoder_plugin_load(struct decoder_plugin * inputPlugin);
-void decoder_plugin_unload(struct decoder_plugin * inputPlugin);
+void decoder_plugin_load(struct decoder_plugin *inputPlugin);
+void decoder_plugin_unload(struct decoder_plugin *inputPlugin);
 
 /* interface for using plugins */
 
-struct decoder_plugin *decoder_plugin_from_suffix(const char *suffix,
-						  unsigned int next);
+const struct decoder_plugin *
+decoder_plugin_from_suffix(const char *suffix, unsigned int next);
 
-struct decoder_plugin *decoder_plugin_from_mime_type(const char *mimeType,
-						     unsigned int next);
+const struct decoder_plugin *
+decoder_plugin_from_mime_type(const char *mimeType, unsigned int next);
 
-struct decoder_plugin *decoder_plugin_from_name(const char *name);
+const struct decoder_plugin *
+decoder_plugin_from_name(const char *name);
 
 void decoder_plugin_print_all_suffixes(FILE * fp);
 
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index 14a1f858f..659d43603 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -37,7 +37,7 @@ static void decodeStart(void)
 	int ret;
 	bool close_instream = true;
 	struct input_stream inStream;
-	struct decoder_plugin *plugin = NULL;
+	const struct decoder_plugin *plugin;
 
 	if (song_is_file(song))
 		uri = map_song_fs(song, buffer);