Merge branch 't/bits_per_sample'
authorAndre Noll <maan@systemlinux.org>
Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 29 Jul 2010 18:52:06 +0000 (20:52 +0200)
1  2 
aacdec_filter.c
alsa_write.c

diff --cc aacdec_filter.c
Simple merge
diff --cc alsa_write.c
Simple merge