[vlc-commits] direct3d: fix compilation (fixes #18030)
Rémi Denis-Courmont
git at videolan.org
Sat Feb 18 11:29:09 CET 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 18 12:28:46 2017 +0200| [461e71b3e1fdf40469b5173ad389a737d2001e79] | committer: Rémi Denis-Courmont
direct3d: fix compilation (fixes #18030)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=461e71b3e1fdf40469b5173ad389a737d2001e79
---
modules/video_output/win32/direct3d11.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index ac30f41..83d2236 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1203,10 +1203,12 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
if (!is_d3d11_opaque(picture->format.i_chroma) || sys->legacy_shader) {
picture_sys_t *p_sys = picture->p_sys;
D3D11_TEXTURE2D_DESC texDesc;
+#if defined(HAVE_ID3D11VIDEODECODER)
if( sys->context_lock != INVALID_HANDLE_VALUE )
{
WaitForSingleObjectEx( sys->context_lock, INFINITE, FALSE );
}
+#endif
if (!is_d3d11_opaque(picture->format.i_chroma))
Direct3D11UnmapPoolTexture(picture);
ID3D11Texture2D_GetDesc(sys->stagingSys.texture[0], &texDesc);
@@ -1222,8 +1224,10 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
0, 0, 0, 0,
p_sys->resource[KNOWN_DXGI_INDEX],
p_sys->slice_index, &box);
+#if defined(HAVE_ID3D11VIDEODECODER)
if ( sys->context_lock != INVALID_HANDLE_VALUE)
ReleaseMutex( sys->context_lock );
+#endif
}
if (subpicture) {
More information about the vlc-commits
mailing list