Merge svn changes up to r30702
commit194efde18f8f2621f847bd2bc2c13bf58e865730
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:08:50 +0000 (10 01:08 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:08:50 +0000 (10 01:08 +0200)
treea98b71eb9727c082d71d1fc728c76e0393ea8b2a
parent415a39cad0c801a9b904e75090730dbe5232142d
parente59081d1218547907a143ab54e1feaec43ec2bff
Merge svn changes up to r30702
mp3lib/sr1.c
stream/stream.h