Merge svn changes up to r30185
commitb390b9b28fa6280f355eeef4811b6cfc02dea01a
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Thu, 7 Jan 2010 23:36:05 +0000 (8 01:36 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Thu, 7 Jan 2010 23:36:05 +0000 (8 01:36 +0200)
treeef67be7ab1b189f5818fb8a273fa10f19d19aec6
parentefe742e3fa08f007ab41f1d666fd1f1c3bf0d63a
parent8e778e501948b67b1f8cd889e68242d1a1eb6041
Merge svn changes up to r30185
13 files changed:
DOCS/man/en/mplayer.1
Makefile
configure
libao2/ao_sdl.c
libmpcodecs/vf_screenshot.c
libvo/aclib.c
libvo/aclib_template.c
libvo/gl_common.c
libvo/gl_common.h
libvo/video_out.c
libvo/vo_matrixview.c
libvo/vo_sdl.c
mplayer.c