Merge svn changes up to r30557
commit8365d174b69518f0acbc6540bd2bb817490e13f4
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:09:46 +0000 (9 23:09 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:09:46 +0000 (9 23:09 +0200)
treefc86d4ba642e9e83b0d05b942b366cc540c4395b
parent7fc3bb2a88dd5603b92a912fd34f834813381941
parent3e5d40ff2e9a45cb4f55f23b787f32bf359bd3d5
Merge svn changes up to r30557
etc/codecs.conf
libao2/ao_mpegpes.c