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

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2010-11-08 18:50:22 +01:00
3 changed files with 9 additions and 2 deletions

View File

@@ -81,7 +81,7 @@ copy_attributes(struct input_rewind *r)
const struct input_stream *src = r->input;
assert(dest != src);
assert(dest->mime != src->mime);
assert(src->mime == NULL || dest->mime != src->mime);
dest->ready = src->ready;
dest->seekable = src->seekable;

View File

@@ -494,7 +494,7 @@ shout_tag_to_metadata(const struct tag *tag, char *dest, size_t size)
}
}
snprintf(dest, size, "%s - %s", title, artist);
snprintf(dest, size, "%s - %s", artist, title);
}
static void my_shout_set_tag(void *data,