Merge svn changes up to r30550
commit36e7a20e695b376287310d602b44d6719f82a021
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:03:14 +0000 (9 23:03 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:03:14 +0000 (9 23:03 +0200)
tree75070d702043e875c947fccaa2de7a419331de22
parent70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb
parent93abb4f09229730c30e5bbdd6c54d4b981995eee
Merge svn changes up to r30550
Makefile
configure
etc/codecs.conf
libmpcodecs/ad_speex.c
libmpdemux/demux_lavf.c
loader/ldt_keeper.c
mplayer.c