wm4 4e89851aa1 Merge branch 'master' into osd_changes ...

Conflicts:
	Makefile
	command.c
	libvo/gl_common.c
	libvo/vo_corevideo.m
	libvo/vo_opengl.c
	libvo/vo_opengl_old.c
	libvo/vo_opengl_shaders.glsl
	sub/ass_mp.c
	sub/osd_libass.c
	sub/sd_ass.c

2012-10-16 07:30:30 +02:00

..

aspect.c

Remove dead code

2012-08-01 17:07:35 +02:00

aspect.h

VO: remove old VO glue

2012-08-07 01:29:56 +02:00

bitmap_packer.c

sub: cosmetics: move things around

2012-10-16 07:26:32 +02:00

bitmap_packer.h

vo_gl3: move OSD code to gl_osd.c

2012-10-16 07:26:31 +02:00

cocoa_common.h

cocoa: gl3: support querying of colors bit depth

2012-05-15 10:37:58 +02:00

cocoa_common.m

cocoa_common: make fullscreen menubar/dock hiding conditional

2012-09-18 21:08:20 +02:00

csputils.c

encode: video encoding now supported using mencoder-like options

2012-09-18 21:08:20 +02:00

csputils.h

encode: video encoding now supported using mencoder-like options

2012-09-18 21:08:20 +02:00

d3d_shader_yuv_2ch.h

vo_direct3d: add hack for using 2 channel textures for 10 bit pixel formats

2012-03-17 21:06:28 +01:00

d3d_shader_yuv.h

vo_direct3d: implement YUV conversion using shaders

2012-03-17 21:05:34 +01:00

d3d_shader_yuv.hlsl

vo_direct3d: add hack for using 2 channel textures for 10 bit pixel formats

2012-03-17 21:06:28 +01:00

fastmemcpy.h

vo_gl3: support RGBA EOSD

2012-10-16 07:26:30 +02:00

filter_kernels.c

libvo: add vo_gl3

2012-03-31 02:58:52 +02:00

filter_kernels.h

libvo: add vo_gl3

2012-03-31 02:58:52 +02:00

geometry.c

Add support for -geometry x syntax since the documentation claims

2010-06-05 06:28:58 +00:00

geometry.h

Replace casual GPL notices by proper license headers.

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

gl_common.c

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

gl_common.h

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

gl_header_fixes.h

gl_common: allow compilation on Mac OS 10.6

2012-10-07 19:22:18 +02:00

gl_osd.c

sub: switch to premultiplied alpha

2012-10-16 07:26:32 +02:00

gl_osd.h

vo_gl: use gl_osd.c

2012-10-16 07:26:31 +02:00

osd_template.c

osd: remove FAST_OSD code

2012-08-07 02:21:19 +02:00

osd.c

osd: get rid of useless initialization function

2012-08-20 15:36:05 +02:00

osd.h

osd: get rid of useless initialization function

2012-08-20 15:36:05 +02:00

osx_common.c

cocoa_common: add HiDPI/retina support

2012-08-16 22:41:09 +02:00

osx_common.h

cocoa_common: add HiDPI/retina support

2012-08-16 22:41:09 +02:00

video_out.c

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

video_out.h

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

vo_caca.c

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

vo_corevideo.h

vo_corevideo: restructure this video output

2012-04-26 21:03:10 +03:00

vo_corevideo.m

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

vo_direct3d.c

sub: switch to premultiplied alpha

2012-10-16 07:26:32 +02:00

vo_image.c

vo_image: add outdir option

2012-08-06 17:52:47 +02:00

vo_lavc.c

encode: fix -ocopyts with certain DVD images

2012-09-29 15:02:36 +02:00

vo_null.c

vo_null: reformat and use new VO API

2012-08-07 01:09:30 +02:00

vo_opengl_old.c

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

vo_opengl_shaders.glsl

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

vo_opengl.c

Merge branch 'master' into osd_changes

2012-10-16 07:30:30 +02:00

vo_vdpau.c

sub: switch to premultiplied alpha

2012-10-16 07:26:32 +02:00

vo_x11.c

vo_x11: reformat, use new VO API

2012-08-07 01:09:22 +02:00

vo_xv.c

Rename to "mpv"

2012-10-12 10:14:32 +02:00

w32_common.c

Rename to "mpv"

2012-10-12 10:14:32 +02:00

w32_common.h

win32: move global variables into a struct & some refactoring

2012-04-14 17:03:11 +02:00

x11_common.c

Rename to "mpv"

2012-10-12 10:14:32 +02:00

x11_common.h

cleanup: remove pointless #defines

2012-09-18 21:04:46 +02:00