aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/input/rewind_input_plugin.c2
-rw-r--r--src/output/shout_plugin.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/input/rewind_input_plugin.c b/src/input/rewind_input_plugin.c
index cee0d3cd4..6325a978e 100644
--- a/src/input/rewind_input_plugin.c
+++ b/src/input/rewind_input_plugin.c
@@ -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;
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 4b73bb334..baaeccf92 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -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,