summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2019-10-14 20:20:25 +0300
committerJan Ekström <jeebjp@gmail.com>2019-10-15 22:12:48 +0300
commit03e7a36a733b839b15d8cb8c71345802350d19f0 (patch)
tree9c33da7aaf90a7ed4acdbc7d4a56b9c967749278 /video
parent89f4ce9d6f31d817eb68dede9b066b0af1416fc2 (diff)
downloadmpv-03e7a36a733b839b15d8cb8c71345802350d19f0.tar.bz2
mpv-03e7a36a733b839b15d8cb8c71345802350d19f0.tar.xz
vo_gpu/d3d11: remove unnecessary nullptr check
mp_to_utf8 will abort in case of either invalid input or OOM.
Diffstat (limited to 'video')
-rw-r--r--video/out/gpu/d3d11_helpers.c4
1 files 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 : "<No Description>");
+ adapter_description);
}
- if (adapter_description && requested_adapter_name.len &&
+ if (requested_adapter_name.len &&
bstr_case_startswith(bstr0(adapter_description),
requested_adapter_name))
{