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

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

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/input/rewind_input_plugin.c
	src/output/httpd_output_plugin.c
This commit is contained in:
Max Kellermann
2010-10-11 20:33:17 +02:00
parent e6fc88a758 b552e9a120
commit a57f9e712d
7 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/curl_input_plugin.c
View File

@@ -264,7 +264,7 @@ input_curl_select(struct input_curl *c, GError **error_r)
return -1;
}
#if LIBCURL_VERSION_NUM >= 0x070f00
#if LIBCURL_VERSION_NUM >= 0x070f04
long timeout2;
mcode = curl_multi_timeout(c->multi, &timeout2);
if (mcode != CURLM_OK) {

7
src/input/rewind_input_plugin.c
View File

@@ -85,10 +85,11 @@ copy_attributes(struct input_rewind *r)
dest->size = src->size;
dest->offset = src->offset;
if (dest->mime == NULL && src->mime != NULL)
/* this is set only once, and the duplicated pointer
is freed by input_stream_close() */
if (src->mime != NULL) {
if (dest->mime != NULL)
g_free(dest->mime);
dest->mime = g_strdup(src->mime);
}
}
static void