summaryrefslogtreecommitdiffstats
path: root/video/out/gl_video.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-15 23:58:33 +0200
committerwm4 <wm4@nowhere>2014-06-16 01:00:59 +0200
commiteca0fcb77a95793b31b6447e0c91bf4d4045efeb (patch)
tree1f244579f55c72b403804ccb8c05d5a8081126d3 /video/out/gl_video.h
parentc5e13cce52fbf4cd45ec0c6220fe2e5f056bb2cd (diff)
downloadmpv-eca0fcb77a95793b31b6447e0c91bf4d4045efeb.tar.bz2
mpv-eca0fcb77a95793b31b6447e0c91bf4d4045efeb.tar.xz
vo_opengl: simplify redraw callback OSD handling
OSD used to be not thread-safe at all, so a track was used to get it redrawn. This mostly reverts commit 6a2a8880, because OSD not being thread-safe was the non-trivial part of it. Mostly untested, because this code path is used on OSX only, and I don't have OSX.
Diffstat (limited to 'video/out/gl_video.h')
-rw-r--r--video/out/gl_video.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/video/out/gl_video.h b/video/out/gl_video.h
index f6d5b2573d..011a62fe5f 100644
--- a/video/out/gl_video.h
+++ b/video/out/gl_video.h
@@ -62,7 +62,6 @@ bool gl_video_check_format(struct gl_video *p, int mp_format);
void gl_video_config(struct gl_video *p, struct mp_image_params *params);
void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b);
void gl_video_set_lut3d(struct gl_video *p, struct lut3d *lut3d);
-void gl_video_draw_osd(struct gl_video *p);
void gl_video_upload_image(struct gl_video *p, struct mp_image *img);
void gl_video_render_frame(struct gl_video *p);
struct mp_image *gl_video_download_image(struct gl_video *p);