mpv - a free, open source, and cross-platform media player

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge svn changes up to r28862	Uoti Urpala	2009-03-07	1	-5/+20
\|\
\| *	Add standard license headers to files.	diego	2009-03-01	1	-5/+20
\| \| \| \| \| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28779 b3059339-0415-0410-9bf9-f77b7e298cf2
* \|	Merge svn changes up to r26979	Uoti Urpala	2008-06-04	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
\| *	cosmetics: Remove useless parentheses from return statements.	diego	2008-05-16	1	-1/+1
\| \| \| \| \| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
* \|	mp_fifo.c, osdep/: Include corresponding .h in .c files	Uoti Urpala	2008-04-29	1	-0/+2
\|/
*	Move #ifdef directives around complete files into the build system.	diego	2007-01-10	1	-4/+0
\| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21873 b3059339-0415-0410-9bf9-f77b7e298cf2
*	Unify include paths, -I.. is in CFLAGS.	diego	2005-11-14	1	-2/+2
\| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16986 b3059339-0415-0410-9bf9-f77b7e298cf2
*	Zeta OS support, mostly working.	reimar	2004-10-11	1	-0/+2
\| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13613 b3059339-0415-0410-9bf9-f77b7e298cf2
*	use threads on windows	faust3	2003-05-26	1	-1/+1
\| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10198 b3059339-0415-0410-9bf9-f77b7e298cf2
*	mem mapped area need to be unmapped.	albeu	2003-04-12	1	-1/+8
\| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9915 b3059339-0415-0410-9bf9-f77b7e298cf2
*	atm shmem.c is only needed for cache2	faust3	2003-04-02	1	-0/+4
\| \| \| \|	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9798 b3059339-0415-0410-9bf9-f77b7e298cf2
*	linux->osdep	arpi	2003-02-09	1	-0/+107
	git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2