oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge release 0.15.10 from branch 'v0.15.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/input/mms_input_plugin.c
This commit is contained in:
Max Kellermann
2010-05-30 18:26:33 +02:00
parent e8310211e2 57e95ea6f4
commit 9dda53e1d2
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/mms_input_plugin.c
View File

@@ -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");