Public Git Hosting - mplayer.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f394231 3961e12)

commit	95da34aa071d64b21ef3e952b987ba3dcee84ca0
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Mon, 17 Aug 2009 23:29:37 +0000 (18 02:29 +0300)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Mon, 17 Aug 2009 23:29:37 +0000 (18 02:29 +0300)
tree	eabf4399e40fd270714c53d40688eadadfd4c5ff	tree \| snapshot (tar.gz zip)
parent	f394231f5de9d1ff679f1b2da4d1f1b303ae914a	commit \| diff
parent	3961e12fca2f1ec10c64e3ff298828feecca52c9	commit \| diff

Merge svn changes up to r29532

21 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
DOCS/xml/en/install.xml	diff1 \|	diff2 \|	blob \| history
cfg-common-opts.h	diff1 \|	diff2 \|	blob \| history
codec-cfg.c	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
libao2/ao_alsa.c	diff1 \|	diff2 \|	blob \| history
libao2/ao_sdl.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ve_x264.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_expand.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_scale.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_mkv.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_pva.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_rtp.cpp	diff1 \|	diff2 \|	blob \| history
libmpdemux/demuxer.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/mp_taglists.c	diff1 \|	diff2 \|	blob \| history
mencoder.c	diff1 \|	diff2 \|	blob \| history
mpcommon.c	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history
stream/tvi_vbi.c	diff1 \|	diff2 \|	blob \| history

MPlayer development branch