Merge svn changes up to r30104
commitdc7f1830224e1953fb07ffcc045735b2b15af310
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 29 Dec 2009 22:14:20 +0000 (30 00:14 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 29 Dec 2009 22:14:20 +0000 (30 00:14 +0200)
tree3028341d6fd07c19b8b7c78fdfd7c411cbdce573
parent0f81e5f9732d143ab47c9b03dfd528f3a0af4aea
parenta0601ed2566d132fec57dcf163372f9f341f3c13
Merge svn changes up to r30104

Ignore the broken correct-pts change in r30100.
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
Makefile
configure
libmpdemux/mp_taglists.c
libvo/gl_common.c
libvo/gl_common.h
libvo/vo_gl.c