summaryrefslogtreecommitdiffstats
path: root/video/out/vo_direct3d.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-18 20:04:59 +0200
committerwm4 <wm4@nowhere>2014-06-18 20:04:59 +0200
commit9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2 (patch)
tree51b48de261874cd48e4e29b0a459eebb9b718cae /video/out/vo_direct3d.c
parent86e5f15592d2c732c03735f4aa7d6361ee0f20dd (diff)
downloadmpv-9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2.tar.bz2
mpv-9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2.tar.xz
video/out: fix redrawing with no video frame for some VOs
With the change to merge osd drawing into video frame drawing, some bogus logic got in: they skipped drawing the OSD if no video frame is available. This broke --no-video --force-window mode.
Diffstat (limited to 'video/out/vo_direct3d.c')
-rw-r--r--video/out/vo_direct3d.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 927730d517..902d437ce3 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -846,7 +846,7 @@ static uint32_t d3d_draw_frame(d3d_priv *priv)
IDirect3DDevice9_Clear(priv->d3d_device, 0, NULL, D3DCLEAR_TARGET, 0, 0, 0);
if (!priv->have_image)
- return VO_TRUE;
+ goto render_osd;
if (priv->use_textures) {
@@ -912,6 +912,8 @@ static uint32_t d3d_draw_frame(d3d_priv *priv)
}
}
+render_osd:
+
draw_osd(priv->vo);
return VO_TRUE;