Uoti Urpala 0301309425 Merge svn changes up to 27824 ...

Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c

2008-10-25 05:12:34 +03:00

..

aclib_template.c

Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.

2008-10-16 20:17:56 +00:00

aclib.c

Start unifying names of internal preprocessor directives.

2008-07-30 12:01:30 +00:00

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

Remove wrong compilation instructions.

2008-09-07 13:57:00 +00:00

fastmemcpy.h

Start unifying names of internal preprocessor directives.

2008-07-30 12:01:30 +00:00

font_load_ft.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

font_load.c

SYS_AMIGAOS4 --> __AMIGAOS4__

2007-12-11 20:39:18 +00:00

font_load.h

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

geometry.c

Replace casual GPL notices by proper license headers.

2008-09-07 14:09:51 +00:00

geometry.h

Replace casual GPL notices by proper license headers.

2008-09-07 14:09:51 +00:00

gl_common.c

Merge svn changes up to r27682

2008-10-02 05:17:23 +03:00

gl_common.h

Merge svn changes up to r27682

2008-10-02 05:17:23 +03:00

gtf.c

Replace casual GPL notices by proper license headers.

2008-09-07 14:09:51 +00:00

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 r27441

2008-08-08 02:13:09 +03:00

old_vo_defines.h

Move movie_aspect to options struct

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

old_vo_wrapper.c

Create a context struct for OSD state

2008-06-24 01:53:58 +03:00

old_vo_wrapper.h

Create a context struct for OSD state

2008-06-24 01:53:58 +03:00

osd_font.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

osd_template.c

Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.

2008-10-16 18:59:27 +00:00

osd.c

Remove unnecessary mangle.h #include.

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

osd.h

Add explanatory comments to the #endif part of multiple inclusion guards.

2007-12-31 16:15:50 +00:00

spuenc.c

spuenc.c: Remove unused code

2008-08-12 14:57:18 +03:00

spuenc.h

spuenc.c: Remove unused code

2008-08-12 14:57:18 +03:00

sub.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

sub.h

Merge svn changes up to r27374

2008-07-30 16:39:24 +03:00

vesa_lvo.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vesa_lvo.h

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

video_out_internal.h

Merge svn changes up to r26783

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

video_out.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

video_out.h

Merge svn changes up to r27399

2008-08-02 22:04:35 +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

Make various functions static

2008-08-12 14:57:12 +03:00

vo_bl.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +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 27824

2008-10-25 05:12:34 +03:00

vo_dfbmga.c

Merge svn changes up to r27649

2008-09-20 16:13:33 +03:00

vo_dga.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

vo_directfb2.c

Merge svn changes up to r27649

2008-09-20 16:13:33 +03:00

vo_directx.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_dxr2.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_dxr3.c

Merge svn changes up to r27441

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

2008-09-03 10:16:30 +03:00

vo_ggi.c

Merge svn changes up to r27399

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

vo_gif89a.c

Merge svn changes up to r27649

2008-09-20 16:13:33 +03:00

vo_gl2.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_gl.c

Merge svn changes up to r27682

2008-10-02 05:17:23 +03:00

vo_ivtv.c

mpeg ao/vo drivers: Fix packet-writing helper function types

2008-08-12 14:57:17 +03:00

vo_jpeg.c

Rename exit_player() use outside core to exit_player_bad()

2008-08-12 14:57:18 +03:00

vo_macosx.h

Support double buffering, fix osd flicker.

2007-11-30 04:20:38 +00:00

vo_macosx.m

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

vo_md5sum.c

Rename exit_player() use outside core to exit_player_bad()

2008-08-12 14:57:18 +03:00

vo_mga.c

Mark the vo_functions_t definitions as const where possible.

2007-12-02 14:39:15 +00:00

vo_mpegpes.c

Merge svn changes up to r27514

2008-09-03 10:16:30 +03:00

vo_null.c

Merge svn changes up to r26783

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

vo_png.c

Add missing #include for mplayer.h, fixes the warning:

2008-10-03 10:18:53 +00:00

vo_pnm.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vo_quartz.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

vo_quartz.h

Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.

2008-09-15 05:40:29 +00:00

vo_s3fb.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vo_sdl.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_svga.c

Merge svn changes up to r26979

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

vo_tdfx_vid.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vo_tdfxfb.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vo_tga.c

Merge svn changes up to r26979

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

vo_v4l2.c

mpeg ao/vo drivers: Fix packet-writing helper function types

2008-08-12 14:57:17 +03:00

vo_vesa.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vo_wii.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

vo_winvidix.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_x11.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_xmga.c

Change a bunch of X11-specific preprocessor directives.

2008-08-04 06:16:23 +00:00

vo_xover.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

vo_xv.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

vo_xvidix.c

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00

vo_xvmc.c

Merge svn changes up to r27458

2008-08-12 15:03:34 +03: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

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vo_zr.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vosub_vidix.c

Merge svn changes up to r27573

2008-09-10 23:59:08 +03:00

vosub_vidix.h

Merge svn changes up to r27573

2008-09-10 23:59:08 +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 27824

2008-10-25 05:12:34 +03:00

x11_common.h

Merge svn changes up to 27824

2008-10-25 05:12:34 +03:00