diff options
author | Max Kellermann <max@duempel.org> | 2009-10-11 23:25:27 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-10-11 23:25:27 +0200 |
commit | 71f881d5cb40fbb77a77a8b50b8d662acaa84310 (patch) | |
tree | ad441b0b2281d155895e6884084c2909ad2ade7c /src/decoder | |
parent | d4e3fb433064afe5c680019532f376bc1493636f (diff) | |
parent | 9a3f5ff977951781453fbe1e597dbd6eb5f7494a (diff) | |
download | mpd-71f881d5cb40fbb77a77a8b50b8d662acaa84310.tar.gz mpd-71f881d5cb40fbb77a77a8b50b8d662acaa84310.tar.xz mpd-71f881d5cb40fbb77a77a8b50b8d662acaa84310.zip |
Merge branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to '')
-rw-r--r-- | src/decoder_thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/decoder_thread.c b/src/decoder_thread.c index be37896c1..9124db033 100644 --- 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); } |