Merge branch 'v0.15.x'

Conflicts: NEWS configure.ac
2009-10-11 23:25:27 +02:00
parent d4e3fb4330 9a3f5ff977
commit 71f881d5cb
5 changed files with 80 additions and 57 deletions
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -189,7 +189,7 @@ static void decoder_run_song(const struct song *song, const char *uri)
 		if (plugin == NULL) {
 			/* we already know our mp3Plugin supports streams, no
 			 * need to check for stream{Types,DecodeFunc} */
-			if ((plugin = decoder_plugin_from_name("mp3"))) {
+			if ((plugin = decoder_plugin_from_name("mad"))) {
 				ret = decoder_stream_decode(plugin, &decoder,
 							    &input_stream);
 			}