From patchwork Sat Feb 19 15:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1888926nkx; Sat, 19 Feb 2022 07:09:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoj7qfHkGcghHmGA8N2EL8KkmmNvgm+t1B14R4fMbPkeuPt6vZFLaUmaLqxaiU+c3GuFcr X-Received: by 2002:a50:ee14:0:b0:410:7a88:4b0c with SMTP id g20-20020a50ee14000000b004107a884b0cmr13093656eds.37.1645283373821; Sat, 19 Feb 2022 07:09:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e2si6761280ejs.226.2022.02.19.07.09.32; Sat, 19 Feb 2022 07:09:33 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=JJkN6fmj; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41FAC68B1E2; Sat, 19 Feb 2022 17:09:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2064.outbound.protection.outlook.com [40.92.89.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9241D68A8C7 for ; Sat, 19 Feb 2022 17:09:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EdYE+4DQBuvnThHaVmDzxvt51klXgnHPgdAIbfFNbi42X6odU7HA5qa+x5bR7O3pQ+OU1d5g8eNKvsJqJGLKhDW9tDic8SFaVb/4uPbTq0ydnUuQG61fTdh0LahGVBzF0xI2GdZRiirxdRzq8l/q/Jv1QIS4SSkMCpZzjBAF2B+NAWr1O57JA9rdcpiJm1WbTMWy5Yx8GRL+2+l0EOojITQ9ToJXCAWq9k2STw+2tJ69q9N0nvf/DOJVHZdqlrHxMTwO52tt92n0GjRjT8pF62CNPYb2+hEz6fPwfXv23pf0Zec0DGUcRXFOOykF7PwjT2zKUrRyXNdqS7c10QOpnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ip2bymv+AqRZRmZskUDqL9p02yzpQvCBycHav3XIy78=; b=OPRDRU7Qm+NuQmM1jMs39H3Z4yPc1hrM+HwQPc7OKpWkdPGz5KAYXddzWYxBxE/ceJbADpXrFMJEESK8qPozWbu2axrESfeqWTUHExhLLlc6y+koeKmih5E6AOycfou4huR3IvUwDsIlTlzbIUUq1uGnadRN/BjjCHRYh/z8HjCfdRWkIFjtAO8TtiTkyLPjHPeAo8+ZUl7XEHk/pbwmvtiVZkyTCyVzw71eK6X/vUyFK/+39v42Bmu24EMZL4whET4/g9hk/RtPVWRin5bc1caw7+hrVyVeLSZY0aTeXqBFKi9S7TR43k0ap/RAMHdK8DOT0DJ3asfT0tOAKxQRkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ip2bymv+AqRZRmZskUDqL9p02yzpQvCBycHav3XIy78=; b=JJkN6fmjCSz2AujN7CsHq7HYsthX4iIxDwJvASHxAVwEriSkXwuKGjrRk+0nYhW70gbmS5pCNYMbYvVMaR59aAvaX8us9cosbNfVq2aWyIR+5cGZL67gT+JiIKXlmP+MI3jCtzoKEBU48mEEBgR0Vcyty/Ua1YGh8yhvt5Fm2FuPo8tfE8GRpQTwrF+cBh83WEPleDD6Tdfg0fp5s+yZEUMHtdybO/GgZEgZoqf4JKzL2PbBIEt+n62kME+0UNty2RjJiFVEveWh/ET6ATjbiIsmONYZjvM946UMbei4klB8sbyp/hX5PfktHaf8laLJ59/9cnoKk1UeYWyBnJ00xw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4732.eurprd03.prod.outlook.com (2603:10a6:10:1d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 15:09:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%4]) with mapi id 15.20.4995.024; Sat, 19 Feb 2022 15:09:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 16:09:16 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [OW6p+QVBA8dYAFh2v0cTRoOz6wGwDOpT] X-ClientProxiedBy: AS8PR05CA0027.eurprd05.prod.outlook.com (2603:10a6:20b:311::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220219150916.112418-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5cba77f-25a6-4c49-ce7f-08d9f3b9cfbf X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJSyAjaCpvSpDmbHMH6ZfTvbF0tN6g6IS+eMc44Bg/aOd1v0N4vuJnXW6C1BF5yEHmgzhTZtGX+APULIwpmOILXN4X4F1cS+yKofOvLl7LWBZXy0CxptBF+T9PJndvhjUSp/b0sf7v9WIcb6XDHZh39emcZ1pyBJQRQQFKnOVERg99nlJIOp4eHbL1/qwpieKTZNBIZGQXdfcQtQ9TotlK2j8ehyiTGuI16MYN0DPUlXKWDn0+bIflkewzp3hQ/cBhFxIlW5tygND57B55vhVerDqBOt/8NOC6YI7j4xhS9d5DQC5AM/H9jO4/LfQ/NMJjWrnRTjSJl0HrS6TzMv6P4G0bUa52MGkJpnJNC6iV+0f9CrFFu6J2K30GsP+EjSp4yHVKsQePhjtMIRiZ8tAyWuVZSkN1b+wCvmr0jRZxX8lbgnZCiVV6fPp0C2i7pD4snfTILRrrbykF+TXc0szR51lseSfdH/kW+OpxaMDGPTwYqBH2TwN/3MjvAkwjyiED7a2y0K4Zrn17cSQNs+WuO/Oh6L//VOs8EnSJB+8oe36bC+eHohB/oegnY6UkVW3laM7EFgfQPmn2/cfM32IhmAHLVTCseRipSMkqFbtyIsIKKNlv1YPlUSV8dMNFxSXspFyDEGiMhdQGMX4XAruu2mfw4ZggnaXXIK3uSymT5K8oDkuIzd12SLwZ49NOqP3CN6403l/R6Ug== X-MS-TrafficTypeDiagnostic: DB7PR03MB4732:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QgZNUmoKR34uYXY+EwTiIfYMesIb2rMhbGIbWGBXU5otyInFzLPNR3fq6oNIsncSsUc8Ot2hXDvyS/06A6jFT2encl8jCGv7M9VXrqJNULwmGvbIVRdreVztQNV7LX57K3Yk3pFdkQPsmqYOBexPAV1UfApXApXbrz1RpsqKM++Gf281SvpqOQyDIo5lSVdqPzvFYBeddS84WgY0vK9GjjKbGSXSiwxAYWB4cHTLlHlQnD7exSORSGSwl4lvDF30N+zuoxz+xxU/2NgHuO94EsbvpIiffMU232fiwAY2Nz7T0AeXIlM3mN3kX+HTWz+1Zq741NH33cqr+qJpTHuhObyBBkDohE+28HLQZT9ZoFNlWE1hAek7KJHPZffKDwuDkTlwUcs9X6CZEqSjGakF7Gsjc8rr/6yhmuVO8tGs+ajQDiCcvFj1IJhgQZ4EHSxwyx/oGv6yLEWl5r4clzc0TK2V0Q1p7unw6xnYTWuPQhk4/Zv3pmHk+Dhk82ev7MDJpXEHNQKoMamE9AbIfv1MvK5pbiYWF9DMnVnvr2GQ7MeSu+0nulHsMu+7IxMzJLlZqLLMjnrtM+G1gTEFwiWFWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ah45eBUtnBs1gJfQWrFzgVkM2E+B+WPC6WZjuOCc7FmpHyM7YzQT6wvSfk+evNXXETxfiJo/w2o7OzA8wTzH2sRcnr9DoJUNvDxO1/Hc+4vw4x7HiEkXTmvpLUOBjWzNRzYRliCSUnGK43D/Sm76GGjOV1CujhduODhDFXnPk4C2qBSh3zx0KiX1aweFAPPV1Guha/hPZ3rexsNbmquEmddss6ydm0q+aTMNXD2RqMXWgaW2QkskvF9O80W3B/jDy9uVp1hZR/lKAsVrKS9BGLYaty5DQ06xyoj22KDJX2WTuh3MRtJCjPyf10ABMUR8DQ5DOyBM24jGHND40oU777A8DqWIeLnANlTcwDYsLbYagv0oKyRQlkVzpgaROEjuOefMqdRCkSbszDULwrWiPD8otb+YbWKJAD/6m7HUIvCrKNiQxpddR3upd0LelNEXPwCal3HmJT2AMh4QNMjGrqL/AUdpov+UyqaujReKogcGkxdFok4mwWcCUBofYc3Am/YZILXRBd01tfCODImWoilH+3BfG4p6liU02qBFQ1Yi2qMhVV00PsUc1AdskWzrgKJTJTuxoDE/r5U3kyCfxRFNoHTLGueJK55/1TYsvPM8hphX5Frum38tzmm9uohLJ7UZNTC9o71gviDcIS1yW+/+aIcQqAZ06PNfNjkrKDbUrE00rZx53dHFmZmuyXHv/nf8uqJ+AEEM3f09VTDfDskNQInyvB5el17oylGpVXs/k0dLB+9r5jkAcHkI2YakOz9qki1Wf2yTAesmG8zWYBKSE6ehP5MSXPHeVJ7LYX/IRPJt9PV68jc5KvCd/YLT6MisI4iRc9VlNcPBqORiTPgSq2SdWI7/T0rbeWfkJR1bYV+nqGG8NvbKs3JEDr0IMPIPTC+p5n1/fc0JKi+IjWQjFc8cDLTK+oEAJCvhBCZVTrU5EkwXkNJRVV6+2lMNl2KZLHiSP1KDzWJIoiGHaw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5cba77f-25a6-4c49-ce7f-08d9f3b9cfbf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 15:09:23.1932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB4732 Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffprobe: Remove redundant checks 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eCcoJ9/n999m A decoder is only opened if there is a decoder for the codec, so every AVCodecContext here has AVCodecContext.codec set. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 4205ddedda..38b7e7e00f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2561,7 +2561,7 @@ static av_always_inline int process_frame(WriterContext *w, int ret = 0, got_frame = 0; clear_log(1); - if (dec_ctx && dec_ctx->codec) { + if (dec_ctx) { switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_AUDIO: @@ -2901,7 +2901,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id break; } - if (dec_ctx && dec_ctx->codec && dec_ctx->codec->priv_class && show_private_data) { + if (dec_ctx && dec_ctx->codec->priv_class && show_private_data) { const AVOption *opt = NULL; while (opt = av_opt_next(dec_ctx->priv_data,opt)) { uint8_t *str;