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",