summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 10:50:43 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 10:50:43 +0000
commiteb761e688ff0a7232c279f100a563b1bae1a5646 (patch)
treefd1b066f8e7b34cee2893b3ca14b4a1e8484482c /libvo
parent3be5ebde87e8856650fdeef9614247bed637cbb1 (diff)
downloadmpv-eb761e688ff0a7232c279f100a563b1bae1a5646.tar.bz2
mpv-eb761e688ff0a7232c279f100a563b1bae1a5646.tar.xz
Remove duplicate OSD drawing introduced due to a conflict between r28840 and r28839.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28842 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_vdpau.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index c40c28d4ff..28ae555e71 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -660,7 +660,7 @@ static void generate_eosd(mp_eosd_images_t *imgs) {
// Nothing changed, no need to redraw
if (imgs->changed == 0)
- goto eosd_draw_only;
+ return;
eosd_render_count = 0;
// There's nothing to render!
if (!img)
@@ -739,8 +739,6 @@ eosd_skip_upload:
eosd_targets[eosd_render_count].source.y1 = i->h;
eosd_render_count++;
}
-eosd_draw_only:
- draw_eosd();
}
static void draw_osd(void)