From 03e7a36a733b839b15d8cb8c71345802350d19f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Mon, 14 Oct 2019 20:20:25 +0300 Subject: vo_gpu/d3d11: remove unnecessary nullptr check mp_to_utf8 will abort in case of either invalid input or OOM. --- video/out/gpu/d3d11_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/video/out/gpu/d3d11_helpers.c b/video/out/gpu/d3d11_helpers.c index 73d2c667a8..e7d0aa9768 100644 --- a/video/out/gpu/d3d11_helpers.c +++ b/video/out/gpu/d3d11_helpers.c @@ -201,10 +201,10 @@ static IDXGIAdapter1 *get_d3d11_adapter(struct mp_log *log, bstr_xappend_asprintf(NULL, listing, "Adapter %u: vendor: %u, description: %s\n", adapter_num, desc.VendorId, - adapter_description ? adapter_description : ""); + adapter_description); } - if (adapter_description && requested_adapter_name.len && + if (requested_adapter_name.len && bstr_case_startswith(bstr0(adapter_description), requested_adapter_name)) { -- cgit v1.2.3