Uoti Urpala af3fcdf2de Merge svn changes up to r27025 ...

Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c

2008-06-07 19:57:57 +03:00

..

aclib_template.c

libvo: change asm syntax to use ASMALIGN and " # nop"

2008-02-15 21:52:34 +00:00

aclib.c

…

aspect.c

Move aspect.c options to option struct

2008-05-01 11:14:29 +03:00

aspect.h

libvo: Move aspect.c static variables to vo struct

2008-05-01 11:02:26 +03:00

aspecttest.c

Add compilation rule for libvo/aspecttest and (hackishly) fix linking.

2008-04-30 14:29:17 +00:00

fastmemcpy.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

font_load_ft.c

font_load_ft.c: Make tables const

2008-04-28 16:38:40 +03:00

font_load.c

…

font_load.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

geometry.c

…

geometry.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

gl_common.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

gl_common.h

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

gtf.c

…

gtf.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

jpeg_enc.c

Use standard license headers with standard formatting.

2008-05-14 17:22:53 +00:00

jpeg_enc.h

Use standard license headers with standard formatting.

2008-05-14 17:22:53 +00:00

mga_common.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

old_vo_defines.h

Move movie_aspect to options struct

2008-04-25 03:34:28 +03:00

old_vo_wrapper.c

Move vo_ontop to options struct

2008-04-23 13:41:06 +03:00

old_vo_wrapper.h

Move vo_ontop to options struct

2008-04-23 13:41:06 +03:00

osd_font.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

osd_template.c

libvo: change asm syntax to use ASMALIGN and " # nop"

2008-02-15 21:52:34 +00:00

osd.c

Remove unnecessary mangle.h #include.

2008-06-04 09:44:12 +00:00

osd.h

…

spuenc.c

Use standard license headers with standard formatting.

2008-05-14 17:22:53 +00:00

spuenc.h

Use standard license headers with standard formatting.

2008-05-14 17:22:53 +00:00

sub.c

sub.c: Make tables const

2008-05-01 09:12:38 +03:00

sub.h

sub.h: Remove obsolete code under #if 0

2008-05-01 20:03:11 +03:00

vesa_lvo.c

Add new video driver API

2008-04-23 13:41:04 +03:00

vesa_lvo.h

Add new video driver API

2008-04-23 13:41:04 +03:00

video_out_internal.h

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

video_out.c

libvo: Move aspect.c static variables to vo struct

2008-05-01 11:02:26 +03:00

video_out.h

libvo: Move aspect.c static variables to vo struct

2008-05-01 11:02:26 +03:00

videodev_mjpeg.h

Add missing header #includes to fix 'make checkheaders'.

2008-03-07 20:07:15 +00:00

vo_3dfx.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_aa.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_bl.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_caca.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_cvidix.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_dfbmga.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_dga.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_directfb2.c

cosmetics: Remove useless parentheses from from return statements.

2008-05-16 08:33:27 +00:00

vo_directx.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_dxr2.c

libvo: Move aspect.c static variables to vo struct

2008-05-01 11:02:26 +03:00

vo_dxr3.c

libvo: Move aspect.c static variables to vo struct

2008-05-01 11:02:26 +03:00

vo_fbdev2.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_fbdev.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_ggi.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_gif89a.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_gl2.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_gl.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_ivtv.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_jpeg.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_macosx.h

…

vo_macosx.m

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_md5sum.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_mga.c

…

vo_mpegpes.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_null.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_png.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_pnm.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_quartz.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_quartz.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

vo_s3fb.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_sdl.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_svga.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_tdfx_vid.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_tdfxfb.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_tga.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_v4l2.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_vesa.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_winvidix.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_x11.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_xmga.c

typo fix: inited --> initialized

2008-02-14 14:23:55 +00:00

vo_xover.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_xv.c

cosmetics: Remove useless parentheses from from return statements.

2008-05-16 08:33:27 +00:00

vo_xvidix.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vo_xvmc.c

cosmetics: Remove useless parentheses from from return statements.

2008-05-16 08:33:27 +00:00

vo_xvr100.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vo_yuv4mpeg.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_zr2.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vo_zr.c

Remove variable arguments from vo control() functions

2008-04-23 13:41:03 +03:00

vosub_vidix.c

Merge svn changes up to r27025

2008-06-07 19:57:57 +03:00

vosub_vidix.h

Merge svn changes up to r27025

2008-06-07 19:57:57 +03:00

w32_common.c

libvo: Move aspect.c static variables to vo struct

2008-05-01 11:02:26 +03:00

w32_common.h

Add missing header #includes to fix 'make checkheaders'.

2008-03-07 20:07:15 +00:00

wskeys.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

x11_common.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

x11_common.h

Move allocation/free of x11 struct to x11_common.c

2008-04-29 16:22:33 +03:00