Public Git Hosting - mplayer/kovensky.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b317e0c 0191da3)

commit	d60ab32af99f56641fb659efad5caf8664c31bf1
author	unknown <Kovensky@.(none)>
	Thu, 8 Oct 2009 17:17:02 +0000 (8 14:17 -0300)
committer	unknown <Kovensky@.(none)>
	Thu, 8 Oct 2009 17:17:02 +0000 (8 14:17 -0300)
tree	f8c361f3e0a4833f608f5fb38c5190c314f37fa9	tree \| snapshot (tar.gz zip)
parent	b317e0c861d10af4e574b49b5a0d182bdf9d8a38	commit \| diff
parent	0191da3cf431bb1810ca3f2030c7dd4d7cdf0a92	commit \| diff

Sync sources with uau's repository

Conflicts:
etc/codecs.conf
libmpdemux/demux_lavf.c
libvo/vo_vdpau.c

17 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
DOCS/tech/slave.txt	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
defaultopts.c	diff1 \|	diff2 \|	blob \| history
etc/codecs.conf	diff1 \|	diff2 \|	blob \| history
help/help_mp-en.h	diff1 \|	diff2 \|	blob \| history
input/input.c	diff1 \|	diff2 \|	blob \| history
input/input.h	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/mp_taglists.c	diff1 \|	diff2 \|	blob \| history
libvo/video_out.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_vdpau.c	diff1 \|	diff2 \|	blob \| history
mencoder.c	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history

Sources used to build Kovensky's MPlayer