aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/mms_input_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-05-30 18:26:33 +0200
committerMax Kellermann <max@duempel.org>2010-05-30 18:26:33 +0200
commit9dda53e1d20ed70b31d8651ad9036f52b1d17360 (patch)
treeb3c353e59783039341af006a602b12c51c01d439 /src/input/mms_input_plugin.c
parente8310211e216a1de0b4e856496633966d106b831 (diff)
parent57e95ea6f425e03d3d1586e02dae6a0974b00f28 (diff)
downloadmpd-9dda53e1d20ed70b31d8651ad9036f52b1d17360.tar.gz
mpd-9dda53e1d20ed70b31d8651ad9036f52b1d17360.tar.xz
mpd-9dda53e1d20ed70b31d8651ad9036f52b1d17360.zip
Merge release 0.15.10 from branch 'v0.15.x'
Conflicts: NEWS configure.ac src/input/mms_input_plugin.c
Diffstat (limited to 'src/input/mms_input_plugin.c')
-rw-r--r--src/input/mms_input_plugin.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/mms_input_plugin.c b/src/input/mms_input_plugin.c
index 2fe9b6bb2..834d111b8 100644
--- a/src/input/mms_input_plugin.c
+++ b/src/input/mms_input_plugin.c
@@ -60,10 +60,13 @@ input_mms_open(const char *url, GError **error_r)
m->mms = mmsx_connect(NULL, NULL, url, 128 * 1024);
if (m->mms == NULL) {
+ g_free(m);
g_set_error(error_r, mms_quark(), 0, "mmsx_connect() failed");
return NULL;
}
+ m->eof = false;
+
/* XX is this correct? at least this selects the ffmpeg
decoder, which seems to work fine*/
m->base.mime = g_strdup("audio/x-ms-wma");