[vlc-devel] [PATCH 4/8] d3d11va: fix the VideoProcessor creation failure detection

Steve Lhomme robux4 at videolabs.io
Tue Sep 6 11:52:36 CEST 2016


---
 modules/codec/avcodec/d3d11va.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 5123fc7..17b3ca8 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -800,7 +800,7 @@ static bool SetupProcessor(vlc_va_t *va, const video_format_t *fmt)
     {
         /* shortcut for the rendering output */
         hr = ID3D11VideoProcessorEnumerator_CheckVideoProcessorFormat(processorEnumerator, sys->render, &flags);
-        if (FAILED(hr) && !(flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
+        if (FAILED(hr) || !(flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
             msg_Dbg(va, "processor format %s not supported for output", DxgiFormatToStr(sys->render));
         else
             processorOutput = sys->render;
@@ -824,7 +824,7 @@ static bool SetupProcessor(vlc_va_t *va, const video_format_t *fmt)
 
                 hr = ID3D11VideoProcessorEnumerator_CheckVideoProcessorFormat(processorEnumerator,
                                                                               output->formatTexture, &flags);
-                if (FAILED(hr) && !(flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
+                if (FAILED(hr) || !(flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
                     msg_Dbg(va, "Processor format %s not supported for output", DxgiFormatToStr(output->formatTexture));
                 else
                 {
-- 
2.8.2



More information about the vlc-devel mailing list