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
Makefile.am
+4 -1
View File
@@ -99,6 +99,7 @@ mpd_headers = \
src/input_stream.h \
src/input/file_input_plugin.h \
src/input/curl_input_plugin.h \
src/input/rewind_input_plugin.h \
src/input/mms_input_plugin.h \
src/text_file.h \
src/text_input_stream.h \
@@ -584,7 +585,9 @@ INPUT_SRC = \
src/input/file_input_plugin.c
if ENABLE_CURL
INPUT_SRC += src/input/curl_input_plugin.c src/icy_metadata.c
INPUT_SRC += src/input/curl_input_plugin.c \
src/input/rewind_input_plugin.c \
src/icy_metadata.c
endif
if ENABLE_MMS