1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-13 10:26:09 +00:00
mpv/libvo
wm4 51e198c2a1 Merge remote-tracking branch 'origin/master'
Conflicts:
	.gitignore
	bstr.c
	cfg-mplayer.h
	defaultopts.c
	libvo/video_out.c

The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.

In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
2012-07-28 17:24:05 +02:00
..
aclib_template.c
aclib.c
aspect.c VO: silence "[ASPECT] Warning: No suitable new res found!" 2011-07-05 00:38:34 +03:00
aspect.h
cocoa_common.h cocoa: gl3: support querying of colors bit depth 2012-05-15 10:37:58 +02:00
cocoa_common.m cocoa: return the real CGLPixelFormatObj 2012-05-15 10:37:58 +02:00
csputils.c vo_gl: improve 10-bit YUV->RGB conversion accuracy slightly 2012-03-09 20:48:55 +02:00
csputils.h vo_gl: improve 10-bit YUV->RGB conversion accuracy slightly 2012-03-09 20:48:55 +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
eosd_packer.c libvo, vo_vdpau: make the EOSD packer code from vo_vdpau generic 2011-12-25 20:42:18 +01:00
eosd_packer.h libvo, vo_vdpau: make the EOSD packer code from vo_vdpau generic 2011-12-25 20:42:18 +01:00
fastmemcpy.h
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.h
gl_common.c cocoa: gl3: support querying of colors bit depth 2012-05-15 10:37:58 +02:00
gl_common.h Merge remote-tracking branch 'origin/master' 2012-04-29 10:01:28 +02:00
gl_header_fixes.h gl_common: move header hacks into gl_header_fixes.h 2012-03-31 02:58:53 +02:00
gtf.c
gtf.h
matrixview_font.h
mga_template.c mpcodecs: remove mp_image_t.x/y 2012-02-24 15:25:22 +01:00
old_vo_defines.h
old_vo_wrapper.c libvo: remove title argument from struct vo_driver.config 2011-12-06 20:32:33 +01:00
old_vo_wrapper.h libvo: remove title argument from struct vo_driver.config 2011-12-06 20:32:33 +01:00
osd_template.c
osd.c
osd.h
osx_common.c input: move all key code lists to input/keycodes.h 2011-05-02 00:43:31 +03:00
osx_common.h
sdl_common.c vo: sdl: handle key modifiers 2011-10-24 07:21:32 +03:00
sdl_common.h vo_gl/sdl: use desktop resolution for fullscreen mode 2011-10-24 06:18:29 +03:00
spuenc.c
spuenc.h
vesa_lvo.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vesa_lvo.h
video_out_internal.h cleanup: remove more warnings 2011-05-02 00:46:48 +03:00
video_out.c Merge remote-tracking branch 'origin/master' 2012-07-28 17:24:05 +02:00
video_out.h Merge remote-tracking branch 'origin/master' 2012-07-28 17:24:05 +02:00
videodev_mjpeg.h
vo_3dfx.c vo_dga: replace xf86dga.h with Xxf86dga.h 2011-04-20 04:22:53 +03:00
vo_aa.c cleanup: shut up more warnings 2011-05-06 18:33:16 +03:00
vo_bl.c
vo_caca.c input: move all key code lists to input/keycodes.h 2011-05-02 00:43:31 +03:00
vo_corevideo.h vo_corevideo: restructure this video output 2012-04-26 21:03:10 +03:00
vo_corevideo.m vo_corevideo, vo_sharedbuffer: put private state in vo->priv 2012-07-27 16:52:22 +03:00
vo_dfbmga.c cleanup: some warning fixes and minor cleanups 2011-06-29 09:17:19 +03:00
vo_dga.c vo_dga: replace xf86dga.h with Xxf86dga.h 2011-04-20 04:22:53 +03:00
vo_direct3d.c win32: move global variables into a struct & some refactoring 2012-04-14 17:03:11 +02:00
vo_directfb2.c mpcodecs: remove mp_image_t.x/y 2012-02-24 15:25:22 +01:00
vo_directx.c vo_directx: clear panscan borders in windowed mode 2012-04-24 01:28:09 +02:00
vo_dxr3.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vo_fbdev2.c cleanup: vo_fbdev: simplify some code 2011-05-02 00:36:20 +03:00
vo_fbdev.c Merge branch 'mplayer1_changes' 2011-05-02 00:46:03 +03:00
vo_ggi.c input: move all key code lists to input/keycodes.h 2011-05-02 00:43:31 +03:00
vo_gif89a.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
vo_gl3_shaders.glsl libvo: add vo_gl3 2012-03-31 02:58:52 +02:00
vo_gl3.c Merge remote-tracking branch 'origin/master' 2012-07-28 17:24:05 +02:00
vo_gl.c vo_gl: reject MS Windows native OpenGL as software rasterizer 2012-04-24 01:27:00 +02:00
vo_ivtv.c
vo_ivtv.h
vo_jpeg.c windows support: unicode filenames 2012-03-09 20:48:54 +02:00
vo_md5sum.c cleanup: vo_md5sum: Remove unused define/undef 2011-01-31 16:03:10 +02:00
vo_mga.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vo_mpegpes.c cleanup: silence some clang warnings 2011-07-06 13:01:08 +03:00
vo_null.c
vo_png.c screenshot, vo_png: fix dependency on sizeof(AVFrame) 2012-04-29 10:01:55 +02:00
vo_pnm.c windows support: unicode filenames 2012-03-09 20:48:54 +02:00
vo_s3fb.c cleanup: mark some vo_directfb2.c and vo_s3fb.c functions static 2011-06-29 11:43:19 +03:00
vo_sdl.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
vo_sharedbuffer.h vo_sharedbuffer: add this video output 2012-04-26 21:03:10 +03:00
vo_sharedbuffer.m vo_corevideo, vo_sharedbuffer: put private state in vo->priv 2012-07-27 16:52:22 +03:00
vo_svga.c mpcodecs: remove mp_image_t.x/y 2012-02-24 15:25:22 +01:00
vo_tdfx_vid.c
vo_tdfxfb.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vo_tga.c
vo_v4l2.c
vo_v4l2.h
vo_vdpau.c Merge remote-tracking branch 'origin/master' 2012-07-28 17:24:05 +02:00
vo_vesa.c vidix: drop VIDIX support 2011-01-31 16:03:10 +02:00
vo_wii.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vo_x11.c vo_xv: avoid clearing too much on resize 2011-07-06 08:36:46 +03:00
vo_xmga.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vo_xover.c
vo_xv.c vo_xv: remove direct rendering support 2012-03-25 22:30:37 +03:00
vo_xvr100.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
vo_yuv4mpeg.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
w32_common.c win32: don't crash if vo_w32_uninit() is called without vo_w32_init() 2012-04-24 01:25:10 +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 Merge remote-tracking branch 'origin/master' 2012-07-28 17:24:05 +02:00
x11_common.h vo_vdpau: disable refresh-aware frame timing when composited 2012-07-27 03:40:38 +03:00