diff options
| author | Max Kellermann <max@duempel.org> | 2010-10-11 20:33:17 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-10-11 20:33:17 +0200 |
| commit | a57f9e712d498e0911fde56e0281e01e3807becc (patch) | |
| tree | 05a36d297fb46b40c6fa4eed5d2ced0dc91ce918 /src/encoder | |
| parent | e6fc88a758af2f0a37376c5c8dcf90db05e4e45a (diff) | |
| parent | b552e9a12077dc73ba7d2aaad7c79a8201efff12 (diff) | |
| download | mpd-a57f9e712d498e0911fde56e0281e01e3807becc.tar.gz mpd-a57f9e712d498e0911fde56e0281e01e3807becc.tar.xz mpd-a57f9e712d498e0911fde56e0281e01e3807becc.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/encoder/vorbis_encoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c index 986135789..9dac3564d 100644 --- a/src/encoder/vorbis_encoder.c +++ b/src/encoder/vorbis_encoder.c @@ -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 = { |