Public Git Hosting - mplayer/kovensky.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c4f7b96 bb54613)

commit	13221a716588dc88c1151e0a0f8eb7cce41d461c
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Tue, 9 Mar 2010 22:13:11 +0000 (10 00:13 +0200)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Tue, 9 Mar 2010 22:13:11 +0000 (10 00:13 +0200)
tree	3184184f1e984d248e2570ffa05c79589d2c9a1c	tree \| snapshot (tar.gz zip)
parent	c4f7b9666f753b320157e6497f9114523878885f	commit \| diff
parent	bb54613ac1211c73a3614db6b7326d7cd9be39da	commit \| diff

Merge svn changes up to r30663

Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c

21 files changed:

TOOLS/realcodecs/cook.c	diff1 \|	diff2 \|	blob \| history
TOOLS/realcodecs/sipr.c	diff1 \|	diff2 \|	blob \| history
cfg-common.h	diff1 \|	diff2 \|	blob \| history
libaf/af.c	diff1 \|	diff2 \|	blob \| history
libmenu/menu_filesel.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ad_qtaudio.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_dmo.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_dshow.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_zrmjpeg.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.c	diff1 \|	diff2 \|	blob \| history
libvo/mga_common.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_dxr3.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvmc.c	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history
stream/asf_mmst_streaming.c	diff1 \|	diff2 \|	blob \| history
stream/network.c	diff1 \|	diff2 \|	blob \| history
stream/stream_cddb.c	diff1 \|	diff2 \|	blob \| history
stream/stream_dvdnav.c	diff1 \|	diff2 \|	blob \| history
stream/stream_file.c	diff1 \|	diff2 \|	blob \| history
stream/tcp.c	diff1 \|	diff2 \|	blob \| history
subreader.c	diff1 \|	diff2 \|	blob \| history

Sources used to build Kovensky's MPlayer