summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-06 20:00:39 +0200
committerwm4 <wm4@nowhere>2014-08-06 20:30:47 +0200
commit19fd67096bda04469124bd3d40bf437d92175462 (patch)
tree343dfa1f42fbe0abe8de9ee64a8cd56ee83a0e41
parent77ad49411af12f023e37a96bf0a3111791c67f2c (diff)
downloadmpv-19fd67096bda04469124bd3d40bf437d92175462.tar.bz2
mpv-19fd67096bda04469124bd3d40bf437d92175462.tar.xz
vo_direct3d: allow resizing before video init
This can just happen in the time between VO creation, and the first call to vo_reconfig. It seems the recent threading changes exposed this bug. Fixes #986.
-rw-r--r--video/out/vo_direct3d.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 34ddafdd1e..c942c964f5 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -793,7 +793,7 @@ static bool resize_d3d(d3d_priv *priv)
return 0;
}
- if (!priv->d3d_device)
+ if (!priv->d3d_device || !priv->image_format)
return 1;
if (!create_d3d_surfaces(priv))