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

Merge vorbis+icy fixes from branch 'v0.15.x'

Browse Source 
Conflicts:
	Makefile.am
	NEWS
	configure.ac
	src/input/curl_input_plugin.c
	src/input_stream.c
This commit is contained in:
Max Kellermann
2009-12-30 23:24:11 +01:00
parent 333e11d0eb 4419e5b90d
commit efc885a9dc
11 changed files with 357 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/decoder/ffmpeg_plugin.c
View File

@@ -481,6 +481,7 @@ static const char *const ffmpeg_mime_types[] = {
"application/ogg",
"application/x-ms-wmz",
"application/x-ms-wmd",
"application/x-ogg",
"application/x-shockwave-flash",
"application/x-shorten",
"audio/8svx",
@@ -495,6 +496,7 @@ static const char *const ffmpeg_mime_types[] = {
"audio/ogg",
"audio/qcelp",
"audio/vorbis",
"audio/vorbis+ogg",
"audio/x-8svx",
"audio/x-16sv",
"audio/x-aac",
@@ -512,6 +514,9 @@ static const char *const ffmpeg_mime_types[] = {
"audio/x-ms-wma",
"audio/x-ms-wax",
"audio/x-musepack",
"audio/x-ogg",
"audio/x-vorbis",
"audio/x-vorbis+ogg",
"audio/x-pn-realaudio",
"audio/x-pn-multirate-realaudio",
"audio/x-speex",

10
src/decoder/flac_plugin.c
View File

@@ -791,9 +791,11 @@ oggflac_decode(struct decoder *decoder, struct input_stream *input_stream)
static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
static const char *const oggflac_mime_types[] = {
"audio/x-flac+ogg",
"application/ogg",
"application/x-ogg",
"audio/ogg",
"audio/x-flac+ogg",
"audio/x-ogg",
NULL
};
@@ -814,7 +816,11 @@ const struct decoder_plugin oggflac_decoder_plugin = {
static const char *const flac_suffixes[] = { "flac", NULL };
static const char *const flac_mime_types[] = {
"audio/x-flac", "application/x-flac", NULL
"application/flac",
"application/x-flac",
"audio/flac",
"audio/x-flac",
NULL
};
const struct decoder_plugin flac_decoder_plugin = {

4
src/decoder/oggflac_plugin.c
View File

@@ -351,9 +351,11 @@ fail:
static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
static const char *const oggflac_mime_types[] = {
"audio/x-flac+ogg",
"application/ogg",
"application/x-ogg",
"audio/ogg",
"audio/x-ogg",
"audio/x-flac+ogg",
NULL
};

7
src/decoder/vorbis_plugin.c
View File

@@ -420,8 +420,13 @@ static const char *const vorbis_suffixes[] = {
static const char *const vorbis_mime_types[] = {
"application/ogg",
"audio/x-vorbis+ogg",
"application/x-ogg",
"audio/ogg",
"audio/vorbis",
"audio/vorbis+ogg",
"audio/x-ogg",
"audio/x-vorbis",
"audio/x-vorbis+ogg",
NULL
};