Public Git Hosting - mplayer/glamo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a06b32b 3e8f281)

commit	d46b86bc7c39082b26ec71aa16431f3275d836ff
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Tue, 29 Dec 2009 22:53:08 +0000 (30 00:53 +0200)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Tue, 29 Dec 2009 22:56:10 +0000 (30 00:56 +0200)
tree	035da87ed658f7d75c0eba5a5d4de5462a4c8ddd	tree \| snapshot (tar.gz zip)
parent	a06b32b64e91082c11f747e2910f10a4afd3dfa9	commit \| diff
parent	3e8f2815c19703f5cb6f75db2910234d499d9676	commit \| diff

Merge svn changes up to r30136

Ignore another broken correct-pts change in 30134.

18 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ad_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/mp_image.h	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_vfw.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_palette.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/aviheader.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_mpg.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demuxer.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demuxer.h	diff1 \|	diff2 \|	blob \| history
libmpdemux/extension.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/stheader.h	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/x11_common.c	diff1 \|	diff2 \|	blob \| history
libvo/x11_common.h	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history

mplayer with SMedia Glamo drivers