From: Laurent Aimar <fenrir@videolan.org>
Date: Mon, 26 Jul 2010 19:34:22 +0000 (+0200)
Subject: Fixed broken video with direct3d for some drivers.
X-Git-Tag: 1.2.0-pre1~5662
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c05fa12539d7423fc0f833118c816eab72212df6;p=vlc

Fixed broken video with direct3d for some drivers.
---

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 5510e69521..4fd89e0336 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -255,8 +255,6 @@ static void Prepare(vout_display_t *vd, picture_t *picture)
     Direct3DUnlockSurface(picture);
 
     Direct3DRenderScene(vd, surface);
-
-    Direct3DLockSurface(picture);
 #endif
 }
 
@@ -273,10 +271,12 @@ static void Display(vout_display_t *vd, picture_t *picture)
     if (FAILED(hr)) {
         msg_Dbg(vd, "%s:%d (hr=0x%0lX)", __FUNCTION__, __LINE__, hr);
     }
+
 #if 0
     VLC_UNUSED(picture);
 #else
     /* XXX See Prepare() */
+    Direct3DLockSurface(picture);
     picture_Release(picture);
 #endif