Merge svn changes up to r31097
commitf38efd166e43f5cae783f38f9913d2859557143e
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 16:22:56 +0000 (26 19:22 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 16:23:32 +0000 (26 19:23 +0300)
tree38f49af429d4147e390f0b52384294b2e35b9d6f
parent7a33e76943ecc3f2ba185a1bea56c8416b74d6dd
parent4e853e19ef349a453ef069d76b830a3dbfa444c3
Merge svn changes up to r31097
19 files changed:
DOCS/man/en/mplayer.1
Makefile
configure
etc/codecs.conf
libvo/gl_common.c
libvo/gl_common.h
libvo/osx_common.c
libvo/sdl_common.c
libvo/video_out.c
libvo/video_out.h
libvo/vo_corevideo.m
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_gl2.c
libvo/vo_kva.c
libvo/vo_sdl.c
libvo/w32_common.c
libvo/x11_common.c
mplayer.c