RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-31 04:02:06 +00:00
Code Issues Releases Wiki Activity
d5c868325c
mpv/loader
History
Uoti Urpala d5c868325c Merge svn changes up to r26979 
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
2008-06-04 08:10:48 +03:00
..
dmo Use consistent #include paths without "../". 2008-04-28 14:50:24 +00:00
dshow cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
qtx Merge svn changes up to r26979 2008-06-04 08:10:48 +03:00
wine cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
afl.c Remove $Id$ tags, they make diffs between different versions 2008-01-27 12:15:27 +00:00
com.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
debug.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
driver.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
driver.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
elfdll.c Remove $Id$ tags, they make diffs between different versions 2008-01-27 12:15:27 +00:00
ext.c #include osdep/mman.h if sys/mman.h is not available. 2008-03-03 09:47:01 +00:00
ext.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
ldt_keeper.c #include osdep/mman.h if sys/mman.h is not available. 2008-03-03 09:47:01 +00:00
ldt_keeper.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
loader.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
module.c Wrap '#include <sys/mman.h>' in HAVE_SYS_MMAN_H. 2008-03-01 10:31:51 +00:00
pe_image.c #include osdep/mman.h if sys/mman.h is not available. 2008-03-03 09:47:01 +00:00
pe_resource.c Remove $Id$ tags, they make diffs between different versions 2008-01-27 12:15:27 +00:00
qt_comp.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
qt_fv.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
registry.c Remove $Id$ tags, they make diffs between different versions 2008-01-27 12:15:27 +00:00
registry.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
resource.c Remove $Id$ tags, they make diffs between different versions 2008-01-27 12:15:27 +00:00
vfl.c Remove $Id$ tags, they make diffs between different versions 2008-01-27 12:15:27 +00:00
win32.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
win32.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
wineacm.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
wrapper.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-23 14:50:55 +00:00
wrapper.S