Public Git Hosting - mplayer/kovensky.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: ecbbbac e5bcd70)

commit	6addd212da636ef066a118374fb07c9a1c503f39
author	Kovenksy <diogomfranco@gmail.com>
	Thu, 19 Nov 2009 18:06:15 +0000 (19 15:06 -0300)
committer	Kovenksy <diogomfranco@gmail.com>
	Thu, 19 Nov 2009 18:06:15 +0000 (19 15:06 -0300)
tree	e203d9442e3a8ad70935d154bd00908c68e75540	tree \| snapshot (tar.gz zip)
parent	ecbbbacb50141535858b35b967dba02582cab12d	commit \| diff
parent	e5bcd70bc5b0557635ae51c7093f0e887493d4ba	commit \| diff

Update sources

Conflicts:
input/input.c
libvo/vo_vdpau.c

14 files changed:

DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
DOCS/tech/slave.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure	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
libmpcodecs/ad_faad.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.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