[vlc-commits] Revert "direct3d11: avoid crashing later in the decoder"

Steve Lhomme git at videolan.org
Fri Feb 10 14:37:19 CET 2017


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Fri Feb 10 14:08:28 2017 +0100| [c96956f24980a548c8deeb471cb8d19fc5a8afcf] | committer: Jean-Baptiste Kempf

Revert "direct3d11: avoid crashing later in the decoder"

This reverts commit 57ff42122f34fee45d78937467c0a5285cabb911.

We are going to need to allow more textures with software decoding mixed with
direct rendering.

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

 modules/video_output/win32/direct3d11.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 6db8f58..2dfa0b6 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -726,11 +726,6 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned pool_size)
     if ( sys->sys.pool != NULL )
         return sys->sys.pool;
 
-    if (pool_size > 30) {
-        msg_Err(vd, "Avoid crashing when using ID3D11VideoDecoderOutputView with too many slices (%d)", pool_size);
-        return NULL;
-    }
-
 #ifdef HAVE_ID3D11VIDEODECODER
     picture_t**       pictures = NULL;
     unsigned          picture_count = 0;



More information about the vlc-commits mailing list