Uoti Urpala 6cce822505 Merge svn changes up to r27399 ...

Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c

2008-08-02 22:04:35 +03:00

..

dmo

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +00:00

dshow

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +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

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +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

drv.c

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +00:00

drv.h

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +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

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +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

Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can

2008-06-08 10:43:30 +00:00

win32.c

Do not provide a prototype for vsscanf when vsscanf is available.

2008-08-02 17:09:13 +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

.align -> .balign

2002-11-25 20:37:12 +00:00