Max Kellermann 4f093d5b97 Merge branch 'v0.16.x' ...

Conflicts:
	Makefile.am
	NEWS
	configure.ac
	src/encoder/flac_encoder.c
	src/log.c
	src/pcm_buffer.c

2011-11-28 11:56:01 +01:00

..

flac_encoder.c

Merge branch 'v0.16.x'

2011-11-28 11:56:01 +01: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

copyright year 2011

2011-01-29 10:13:54 +01:00

vorbis_encoder.c

Merge branch 'v0.16.x'

2011-07-20 21:46:05 +02:00

wave_encoder.c

Merge branch 'v0.16.x'

2011-11-28 11:56:01 +01:00