Max Kellermann c22cbbf828 Merge branch 'v0.16.x' ... Conflicts: src/output/osx_plugin.c src/text_input_stream.c		2012-04-05 00:45:39 +02:00
..
flac_encoder.c	Merge branch 'v0.16.x'	2012-04-05 00:45:39 +02:00
lame_encoder.c	copyright year 2011	2011-01-29 10:13:54 +01:00
null_encoder.c	Merge branch 'v0.16.x'	2011-11-28 11:56:01 +01:00
twolame_encoder.c	Merge branch 'v0.16.x'	2012-04-05 00:45:39 +02:00
vorbis_encoder.c	Merge branch 'v0.16.x'	2012-04-05 00:45:39 +02:00
wave_encoder.c	audio_format: remove the packed S24 format	2012-03-22 00:42:12 +01:00