[MPlayer-cvslog] r28842 - trunk/libvo/vo_vdpau.c

[reimar]

Author: reimar
Date: Fri Mar  6 11:50:43 2009
New Revision: 28842

Log:
Remove duplicate OSD drawing introduced due to a conflict between r28840 and r28839.

Modified:
   trunk/libvo/vo_vdpau.c

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Fri Mar  6 11:45:49 2009	(r28841)
+++ trunk/libvo/vo_vdpau.c	Fri Mar  6 11:50:43 2009	(r28842)
@@ -660,7 +660,7 @@ static void generate_eosd(mp_eosd_images
 
     // 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)