From patchwork Mon Sep 12 13:02:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37854 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp59809pzh; Mon, 12 Sep 2022 06:02:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6je3kFhNmpWzRypBND96vR7hFTZyysosDsgO+tnciQ8ceRk2zRYxUSSb1xR3RxpKVjLcf9 X-Received: by 2002:a17:907:6d08:b0:77b:d4f:e409 with SMTP id sa8-20020a1709076d0800b0077b0d4fe409mr7579146ejc.744.1662987765548; Mon, 12 Sep 2022 06:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662987765; cv=none; d=google.com; s=arc-20160816; b=lfCgWX995IBTA61LsQqRMRwhLCLFoAX6iWvG1SuL4K/OdSP/dNf8vyypZzhMmm1WgV Q7vODZ0V3SE44MEaahSEVqnF/XKVyoEvpOkRW8qmrK5vVWg6fJ5QoGDXZVvA4E4/dans 9+ChGMoKom01Gc2U6DmbQvgmxXGOfEScHpybyVjsv23m1K+9ACp5nSX+0xV86TA+5J77 yIF5Vag1jDvx9ja3075uozFkqjnaLMv5wQyo2IlpxcVrP1Q0aLgHgnlkPTCcDCKzGdCU vZNhwAhjisHclqCQrQzGHawN6nvUPw4tfcrSDFXT1ECwtEs5lo78vTJ/OAA23IILJ6Td vG4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=peExg/i93rLvnAgkyFPWRC6aULqXN7+yJBwwSNM17+s=; b=O/eKfTN1v46c9vF5nQ0fL3X6tiXzbZkW3jOW5piU03+XsaQs67F4r1xbK2rt+LBZXb LDMUgsWOUJEkkeU4HOjg64s9QIcHCxhDMs1hn06oaqvq/rDStXGyIztkwonDFpmGbp14 xEzt7ZfWLWjx2h2+4qOAIyQR+kpqUg8woeDwgVMfNsYnqwwPc+A5mBVksOfB+Nf8Bxv/ pl/L278OusvX2r5Sn5uXTvEOkS6YXOyDw83Gu8jcTvIGw7Sb0ZnppMvxnSh5efU7fog6 0oPRLFeCBRFZrJOPQWtEldsDiqrQnCuw0V695BiDvR/L5J8x/dITERPms/LgITwb53Mw Q23g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Su2a8m/1"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j2-20020a17090643c200b0072fc714c92fsi5879965ejn.902.2022.09.12.06.02.44; Mon, 12 Sep 2022 06:02:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Su2a8m/1"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6145568BB41; Mon, 12 Sep 2022 16:02:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63B4068B9A4 for ; Mon, 12 Sep 2022 16:02:34 +0300 (EEST) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-1225219ee46so23171000fac.2 for ; Mon, 12 Sep 2022 06:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=zzztd3QPBBDkM6a/fRJZy4Qic2ue7sIGrAQzsnlbZLI=; b=Su2a8m/1E5fRJOwJ3cZF6yvraG0ZQhg5AWLYCdCZcbl7xWEsarGGLaItNp9jIrlIF9 MckhG0SlWD44DANpPsfh4vlVE/U9tcYRz9fiXlmF0+YWyTdfUYj8CTAmtzkS99xPtrZ5 SCpbn1QLL6HjHNSMFrsBoheOByy1zy1Bj1ctmEy9N9x96hHtWpik0qrywhnolNX3lHIz phkbkjuQrTjQBlcGxZJLLl0KEPGVV2Y5w+7shclKJfnfr6kQ9kpeWewhQARkk89uhVaK 09cQaJkaP8dIl6kjrZsZ3BJmM7FXoBKJKAlPMBrtmadG6RYrOEu3Up76HJjJ8DDNs3GZ 3a5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=zzztd3QPBBDkM6a/fRJZy4Qic2ue7sIGrAQzsnlbZLI=; b=0q/Gm33lAtPXjpkFElh7N/DkKFp1y/QTXxnsJ4FfPeJ+l9S4yyjRjO2POvSYuBwXYH EYIPvJfb3N8Frr6j/iAnpQYqeBJn2ydCf2O9RVFpuH1EpEtFqSVdqWxtzYkSng6FqGNw gkGtmIN3ebVooS55zvQOoqoYFUlKkdESEdDCOeyy0JFkHha9a0jEFzu4LY/mpFFETU4o Ku7S/g5pImHJXK9eu7PF9btE7m87z+LrTQPkTz5NWkfgnxDuYZ8+czuJxwOj+fep+oqz QivV+iZ8ytwJvdCPPkaf8urCcnWY0BnAR2JJZXtwHiT0pnSDMOngJuK282IpzNZiyGSm 6L2Q== X-Gm-Message-State: ACgBeo0CYekgYj/dfWLKCWVjizFcKt/T06MIi2kZu4IX2Q9nKjsQJVpu mbWUz6vh9bVbHlmNL6I08j59VlCaEW0= X-Received: by 2002:a05:6808:b0f:b0:34f:946a:15b1 with SMTP id s15-20020a0568080b0f00b0034f946a15b1mr3429297oij.186.1662987752058; Mon, 12 Sep 2022 06:02:32 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id r1-20020a056870e8c100b001274d5999c2sm5482629oan.31.2022.09.12.06.02.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 06:02:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Sep 2022 10:02:08 -0300 Message-Id: <20220912130208.2222-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/opt_common: check the return value of av_hwdevice_get_type_name before printing it X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vWT3IVwRdl73 It may be NULL, as is the case for D3D11VA_VLD. Running "ffmpeg -h decoder=h264" on a Windows build Before: Decoder h264 [H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10]: Supported hardware devices: dxva2 (null) d3d11va cuda After: Decoder h264 [H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10]: Supported hardware devices: dxva2 d3d11va cuda Signed-off-by: James Almer --- fftools/opt_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 7cd8b1c66e..8a06df82df 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -335,9 +335,12 @@ static void print_codec(const AVCodec *c) printf(" Supported hardware devices: "); for (int i = 0;; i++) { const AVCodecHWConfig *config = avcodec_get_hw_config(c, i); + const char *name; if (!config) break; - printf("%s ", av_hwdevice_get_type_name(config->device_type)); + name = av_hwdevice_get_type_name(config->device_type); + if (name) + printf("%s ", name); } printf("\n"); }