Merge svn changes up to r30419
commite28e4a1b157bd0e9620fcff956d713a9921f506c
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 13:59:53 +0000 (25 15:59 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 13:59:53 +0000 (25 15:59 +0200)
treed92e54e1e25feb84e692396cf234478f403e5738
parent560acfd0407c757e17bf72b490687d4947b05675
parent213092c8dcfc925d8d54cf320b60cf298a870696
Merge svn changes up to r30419
15 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
DOCS/xml/en/documentation.xml
command.c
libao2/ao_pcm.c
libmpcodecs/vd.c
libmpcodecs/vf_fspp.c
libmpcodecs/vf_halfpack.c
libmpcodecs/vf_scale.c
libmpcodecs/vf_spp.c
mplayer.c
stream/cache2.c
stream/stream.c
subreader.c
version.sh