vlc/vlc-3.0 | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Mon Feb 12 
14:55:35 2018 +0100| [d19188ad5673117c98902ece324ca2a0c29cf6e1] | committer: 
Hugo Beauzée-Luyssen

direct3d11: protect the context that might be used in UpdatePicQuadPosition()

It can only happen in 360 videos.

Unlikely to fix 715107d9-c5e4-4ca7-8493-4570f7eaa154

(cherry picked from commit b80ed34d2909ef9f8e242bdb9ce757edcf316d44)
Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d19188ad5673117c98902ece324ca2a0c29cf6e1
---

 modules/video_output/win32/direct3d11.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 6ca4a3a2be..a5b35958b6 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -956,8 +956,6 @@ static void UpdateSize(vout_display_t *vd)
 
     UpdateBackBuffer(vd);
 
-    UpdatePicQuadPosition(vd);
-
 #if defined(HAVE_ID3D11VIDEODECODER)
     if( sys->context_lock != INVALID_HANDLE_VALUE )
     {
@@ -965,6 +963,8 @@ static void UpdateSize(vout_display_t *vd)
     }
 #endif
 
+    UpdatePicQuadPosition(vd);
+
     UpdateQuadPosition(vd, &sys->picQuad, &sys->sys.rect_src_clipped,
                        vd->fmt.projection_mode, vd->fmt.orientation);
 

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to