Merge svn changes up to r30322
commitff2df2ac545bb36ca4c1d2f872236cdf0a7218ab
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 13:17:50 +0000 (25 15:17 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 13:17:50 +0000 (25 15:17 +0200)
treedf3c0f31373ac65f38df0061fc8ec180abde1993
parent8dd016c538340e4a50628eedae0561d45c95ef6b
parent5f5462c0ec32348a0b370b1f9c11bd7d10b52de6
Merge svn changes up to r30322
DOCS/man/en/mplayer.1
configure
etc/codecs.conf
help/help_mp-hu.h
libmpcodecs/ad_ffmpeg.c