Public Git Hosting - mplayer/glamo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b309b60 96daf7e)

commit	53eeb0e41238699fb11701c357941f904338bb25
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Tue, 7 Apr 2009 23:43:44 +0000 (8 02:43 +0300)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Tue, 7 Apr 2009 23:43:44 +0000 (8 02:43 +0300)
tree	965f3585bc690f9b5f654f1022a4c02709911706	tree \| snapshot (tar.gz zip)
parent	b309b60a0c7230fae29475e8924ff51f107c2563	commit \| diff
parent	96daf7ed5ef96b86f2539164c27155bc830aa2a6	commit \| diff

Merge branch 'ordered_chapters'

12 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
defaultopts.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demuxer.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_vdpau.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_x11.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xv.c	diff1 \|	diff2 \|	blob \| history
mencoder.c	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history
options.h	diff1 \|	diff2 \|	blob \| history

mplayer with SMedia Glamo drivers