aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2005-12-27 06:12:28 +0000
committerEric Wong <normalperson@yhbt.net>2005-12-27 06:12:28 +0000
commit18e5825cae10e3500ff75fdbbb7a768b8387a1c2 (patch)
tree4058b9c4ec0f36472bf9a40f0ff89a4dc0e14616
parent6ac406b0aad718393b6bcdb8585c0af2cb2b6caa (diff)
downloadmpd-18e5825cae10e3500ff75fdbbb7a768b8387a1c2.tar.gz
mpd-18e5825cae10e3500ff75fdbbb7a768b8387a1c2.tar.xz
mpd-18e5825cae10e3500ff75fdbbb7a768b8387a1c2.zip
decode.c (OggFLAC branch-only): do not assume mp3 is supported, EVER
git-svn-id: https://svn.musicpd.org/mpd/branches/oggflac@3743 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/decode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/decode.c b/src/decode.c
index 1c78065b4..28a64e169 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -358,10 +358,11 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) {
/* this is needed for bastard streams that don't have a suffix
or set the mimeType */
if(plugin == NULL) {
- plugin = getInputPluginFromName("mp3");
/* we already know our mp3Plugin supports streams, no
* need to check for stream{Types,DecodeFunc} */
- ret = plugin->streamDecodeFunc(cb, dc, &inStream);
+ if ((plugin = getInputPluginFromName("mp3")))
+ ret = plugin->streamDecodeFunc(cb, dc,
+ &inStream);
}
}
else {