From 175cfc985c24c8599214f716a521fe9c75f54a94 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 6 Mar 2009 10:53:30 +0000 Subject: [PATCH] Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD, just like vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28843 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 19ae7e9c75..f37d2361fb 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -301,7 +301,7 @@ static void genEOSD(mp_eosd_images_t *imgs) { ass_image_t *i; if (imgs->changed == 0) // there are elements, but they are unchanged - goto call_render; + return; if (img && imgs->changed == 1) // there are elements, but they just moved goto skip_upload; @@ -386,8 +386,6 @@ skip_upload: } glEndList(); BindTexture(gl_target, 0); -call_render: - if (vo_doublebuffering) do_render_osd(2); } /** @@ -1118,6 +1116,7 @@ static int control(uint32_t request, void *data, ...) if (!data) return VO_FALSE; genEOSD(data); + if (vo_doublebuffering) do_render_osd(2); return VO_TRUE; case VOCTRL_GET_EOSD_RES: { -- 2.11.4.GIT