Merge svn changes up to r31332
commit8362ad36ac2ee8dc452765a9de559b50927d14be
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 5 Jun 2010 20:37:42 +0000 (5 23:37 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 5 Jun 2010 20:37:42 +0000 (5 23:37 +0300)
tree93c9ab1208e7186a03c12cf580b0bde04bca0ec7
parentb6db3567508ea5a4313e2a4894fe96d1840fd74f
parent601d6af3ece91f65df77ed213a7eafb56e75abd1
Merge svn changes up to r31332
DOCS/man/en/mplayer.1
etc/codecs.conf
libmpcodecs/vf_format.c
libmpcodecs/vf_noformat.c