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

Merge branch 'v0.16.x'

Browse Source 
Conflicts:
	src/output/osx_plugin.c
	src/text_input_stream.c
This commit is contained in:
Max Kellermann
2012-04-05 00:45:39 +02:00
parent f930f37d35 5acee73fc8
commit c22cbbf828
16 changed files with 311 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/encoder/flac_encoder.c
View File

@@ -354,6 +354,7 @@ const struct encoder_plugin flac_encoder_plugin = {
.finish = flac_encoder_finish,
.open = flac_encoder_open,
.close = flac_encoder_close,
.end = flac_encoder_flush,
.flush = flac_encoder_flush,
.write = flac_encoder_write,
.read = flac_encoder_read,