merge with mpd/trunk up to r3925

git-svn-id: https://svn.musicpd.org/mpd/trunk@3926 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-03-16 06:52:46 +00:00
parent d7e846bdc2
commit 6963502213
25 changed files with 1201 additions and 354 deletions
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -259,6 +259,7 @@ InputPlugin modPlugin =
        NULL,
 	mod_finishMikMod,
 	NULL,
+	NULL,
        mod_decode,
        modTagDup,
        INPUT_PLUGIN_STREAM_FILE,
@@ -273,6 +274,7 @@ InputPlugin modPlugin =
        NULL,
        NULL,
        NULL,
+	NULL,
        NULL,
 	NULL,
 	NULL,