wm4 84829a4ea1 Merge branch 'osd_changes' into master ...

Conflicts:
	DOCS/man/en/options.rst

2012-11-01 02:12:47 +01:00

..

aspect.c

sub: fix text subtitle aspect ratio with vo_xv and vo_lavc, refactor

2012-10-24 21:56:33 +02:00

aspect.h

sub: fix text subtitle aspect ratio with vo_xv and vo_lavc, refactor

2012-10-24 21:56:33 +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_common: use IOKit to perform power management

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

cocoa_common.m

cocoa_common: avoid situational nil dereferencing

2012-10-19 23:47:03 +02:00

csputils.c

mp_image: add fields to pass colorspace down the filter chain

2012-10-28 15:31:32 +01:00

csputils.h

mp_image: add fields to pass colorspace down the filter chain

2012-10-28 15:31:32 +01: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

geometry: remove useless NULL check

2012-10-31 22:36:37 +01:00

geometry.h

Replace casual GPL notices by proper license headers.

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

gl_common.c

Merge branch 'osd_changes' into master

2012-11-01 02:12:47 +01:00

gl_common.h

Merge branch 'master' into osd_changes

2012-10-24 22:38:45 +02:00

gl_header_fixes.h

gl_common: hack to support compilation on FreeBSD

2012-10-20 17:31:25 +02:00

gl_osd.c

VO, sub: refactor

2012-10-24 21:56:34 +02:00

gl_osd.h

VO, sub: refactor

2012-10-24 21:56:34 +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 'osd_changes' into master

2012-11-01 02:12:47 +01:00

video_out.h

Merge branch 'osd_changes' into master

2012-11-01 02:12:47 +01: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

screenshot: remove hack for passing anamorphic image size

2012-11-01 02:07:45 +01:00

vo_direct3d.c

VO: remove code duplication for setting up mp_osd_res

2012-11-01 02:07:46 +01:00

vo_image.c

screenshot: let VOs pass colorspace information via mp_image

2012-11-01 02:07:45 +01:00

vo_lavc.c

screenshot, draw_bmp: use colorspace passed with mp_image

2012-11-01 02:07:45 +01:00

vo_null.c

vo_null: reformat and use new VO API

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

vo_opengl_old.c

vo_opengl, vo_opengl_old: remove -wid/viewport special case

2012-11-01 02:07:46 +01:00

vo_opengl_shaders.glsl

Merge branch 'master' into osd_changes

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

vo_opengl.c

VO: remove code duplication for setting up mp_osd_res

2012-11-01 02:07:46 +01:00

vo_vdpau.c

Merge branch 'osd_changes' into master

2012-11-01 02:12:47 +01:00

vo_x11.c

Merge branch 'osd_changes' into master

2012-11-01 02:12:47 +01:00

vo_xv.c

VO: remove code duplication for setting up mp_osd_res

2012-11-01 02:07:46 +01:00

w32_common.c

options: remove --adapter

2012-10-30 19:50:23 +01:00

w32_common.h

options: remove --adapter

2012-10-30 19:50:23 +01:00

x11_common.c

x11_common: make some variables static

2012-10-31 22:31:52 +01:00

x11_common.h

cleanup: remove pointless #defines

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