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

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
7 changed files with 29 additions and 5 deletions

View File

@@ -386,7 +386,7 @@ vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length)
static const char *
vorbis_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder)
{
return "application/x-ogg";
return "audio/ogg";
}
const struct encoder_plugin vorbis_encoder_plugin = {