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

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

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/decoder_control.c
	src/decoder_control.h
	src/input/rewind_input_plugin.c
	src/output_control.c
	src/output_thread.c
	src/player_thread.c
This commit is contained in:
Max Kellermann
2010-11-07 15:30:18 +01:00
parent 5a26320680 dec7090198
commit 4478b3ef74
11 changed files with 109 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/input/rewind_input_plugin.c
View File

@@ -80,14 +80,16 @@ copy_attributes(struct input_rewind *r)
struct input_stream *dest = &r->base;
const struct input_stream *src = r->input;
assert(dest != src);
assert(dest->mime != src->mime);
dest->ready = src->ready;
dest->seekable = src->seekable;
dest->size = src->size;
dest->offset = src->offset;
if (src->mime != NULL) {
if (dest->mime != NULL)
g_free(dest->mime);
g_free(dest->mime);
dest->mime = g_strdup(src->mime);
}
}