[vlc-commits] commit: Fixed broken video with direct3d for some drivers. (Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Jul 26 21:34:22 2010 +0200| [9b2606c3870b8efdc0011bb177f03ddf2cafc9a0] | committer: Jean-Baptiste Kempf 

Fixed broken video with direct3d for some drivers.
(cherry picked from commit c05fa12539d7423fc0f833118c816eab72212df6)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=9b2606c3870b8efdc0011bb177f03ddf2cafc9a0
---

 modules/video_output/msw/direct3d.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 4728e7d..37eaf1d 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -252,8 +252,6 @@ static void Prepare(vout_display_t *vd, picture_t *picture)
     Direct3DUnlockSurface(picture);
 
     Direct3DRenderScene(vd, surface);
-
-    Direct3DLockSurface(picture);
 #endif
 }
 
@@ -270,10 +268,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