Merge branch 't/bits_per_sample'

author Andre Noll <maan@systemlinux.org>

Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)

committer Andre Noll <maan@systemlinux.org>

Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
author Andre Noll <maan@systemlinux.org>
Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
committer Andre Noll <maan@systemlinux.org>
Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
diff --cc aacdec_filter.c
Simple merge
diff --cc alsa_write.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
		1	2
aacdec_filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
alsa_write.c	patch \|	diff1 \|	diff2 \|	blob \| history