Public Git Hosting - mplayer/glamo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e46ce9c 409bb1c)

commit	1715c2a33632b333f8e8e581ef23ea5fe0234edd
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Mon, 17 Nov 2008 18:50:23 +0000 (17 20:50 +0200)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Mon, 17 Nov 2008 18:50:23 +0000 (17 20:50 +0200)
tree	f2f9ddca0f4940edd845d71a5bfd74c8a09ba633	tree \| snapshot (tar.gz zip)
parent	e46ce9c0ac88cdc3b4604c249576cfde0c5c4946	commit \| diff
parent	409bb1c5daba69aac788ce5065d05b8ea8441cfd	commit \| diff

Merge svn changes up to r27949

Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c

19 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
DOCS/man/fr/mplayer.1	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
common.mak	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
libvo/gl_common.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_dxr3.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl2.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_png.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_x11.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xover.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvidix.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvmc.c	diff1 \|	diff2 \|	blob \| history
libvo/w32_common.c	diff1 \|	diff2 \|	blob \| history
libvo/x11_common.c	diff1 \|	diff2 \|	blob \| history
libvo/x11_common.h	diff1 \|	diff2 \|	blob \| history
stream/cache2.c	diff1 \|	diff2 \|	blob \| history

mplayer with SMedia Glamo drivers