From patchwork Fri May 21 09:17:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp343199iof; Fri, 21 May 2021 02:24:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb8Omi8f84nauDSfnwtAWQOEyeU/fLjxSvFLExEteGpRUfHhysErPIoYa8Frc0GnG7LibT X-Received: by 2002:a17:907:6289:: with SMTP id nd9mr9166067ejc.384.1621589045519; Fri, 21 May 2021 02:24:05 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d15si2182369edu.375.2021.05.21.02.24.05; Fri, 21 May 2021 02:24:05 -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=@outlook.com header.s=selector1 header.b=T0pdfqh1; 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 DAAC868995F; Fri, 21 May 2021 12:19:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074060.outbound.protection.outlook.com [40.92.74.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3A0A689969 for ; Fri, 21 May 2021 12:19:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nG9dxTRrAWollb7cDKKFksn0Zt4P34BBi+8DmHEgVbFC5uimszftFDVPJCx1Silj7Pdv4//Eu8OXVn3+esrKi3XQW8Gp4fLWNnLl+A+KuF9N2ySdHCuwxuNPOVHJgAmASWB/skYkLgA6tKSMlheAogbtCHZfdx3r/OM7VS0rBFcoLFqot4cwK3OZZSQudHQFDnuzUh2RipLqnGkbLAWHvUm2CAfRXolVajIxIY7pa1bvzf7vNrvv7QOI/xPTiBu8EUu1tm1egROGV+C4YDD3APKCDFlsznJmMaOUSCSLKEU5aQ+Nv5VpNyCsN0RTsLw1zhlDQ+96gV77oTiw+I5m/A== 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-SenderADCheck; bh=mGaSv7HR6WXKY3OxzQjO8hm1GcGlAUhARUPtCOP+XTQ=; b=kWJUaRVWW4CJbhZsI/65IOMMBWPm+YmAYR88N30OND9rxU6YQaZ3ZSWcblhCSOTUHu1QawSDrEa+TE77RSQpP8sfF2KPldRA/8367QIvMxq2dNlBXjnR4hbdiIDL42TuacV6LZFRiapYcM4YpVilL3ZVUWZeb5gmwViOOyfIkoY1hypyY538DUrfb6+UMKGR/WCnRSDM0UOmHbXD8UvP3rR3kjeyYA7+1REu8GdbnuVfZ3XKj6SAg0cLcbGAk+9ErOmiXHTKmc5JqW/CMM2ICziR9IQeaU1gGcQTvSEdUAnEteO7JinsVN+vJSCMxllsTC5sU5o4lcptkOQyMBsnCQ== 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=mGaSv7HR6WXKY3OxzQjO8hm1GcGlAUhARUPtCOP+XTQ=; b=T0pdfqh10OStdlOGsK+MH/yLOsZeiV1W6lnSmzS0AQo2a1Cydtso1uvynnQ3VvepezuHcPwZMxNN3yvicxswa6HsTZSTZZuHOCbDmV0NWPY2LfaKP9YcydM2x4ogbpS0g/ZT0bQEIggCcj64JKbMC4NKsiCF7B1/7xHv6wtFUJMMfJnVKpPYPnrT0VN7P3Z86FHG0wEt8oabfwpG7AIR1/OI+CGXIK2cZDlc7+faCzgoHlbCosSxzOjlB3fhFyg+U7V2mGj9vkb8mkIeKR0U+erG59o2cQRKdI7tiAX1OwMKa9H7e2JHPpRlvGWz2hYc1pgP82NqtDLLgQ0ZH/WWoA== Received: from DB3EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::48) by DB3EUR04HT005.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::299) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 21 May 2021 09:19:11 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::50) by DB3EUR04FT053.mail.protection.outlook.com (2a01:111:e400:7e0c::226) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 21 May 2021 09:19:11 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F02899304C6ED98E7B7FF761BC7313D7A37DC2E745224A1BE8487EBA12421F30; UpperCasedChecksum:93BDE24AD3239DAF730AC07FE06FEBCB3AE7E906B6800AF156A8DCCBD9776377; SizeAsReceived:7782; Count:50 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4150.025; Fri, 21 May 2021 09:19:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 11:17:41 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [mc67fKcUIz5z+V+TxsWoN8cCMUWqMJeb] X-ClientProxiedBy: PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210521091742.184902-37-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.27) by PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 21 May 2021 09:18:44 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 148c6312-8d46-4233-7330-08d91c396f1d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/M7M4vrgvBd+IenKLBfauq7Kkded56W0HQq4wNVE20t4oyPejttIW7s53nTXwAhYUGPlFZDoiSgvAqBts1cKeBANN0TfKXLgiakgFcsDUh0QqMLizXVMN/2IXfiE+zkcAAOA98XzzSjNQlEVn7sl/EKyXxX7uvLzCbJpZ1lT0wo6OQ+tYR6M4uhVwbzC1rXv88QF55PnB5sXeYT7hR800FZOXsJJ8Hjkgu2oKUE8S3djrCobEWk1ydl/T6L3udLHGroJbTqcDm0F3O05Dz9fQUiMkEYujYjSmxBzNYEVCk72Ry7LhNDjN8+R9AnIdHk764S/oEutC/kJGO39a+qyEvZOeM9ovCIwmzXGvSqMK+niuXTfs4RZsOAG4jAmG2JP0htDNs/390UQQ4AsjnHn5VNJwodKjIOjHONNcW98+WSgBRUJh0XGGYaxAatNtCdgL9jTvntVSWn4YWrPOyu3sAgUyUXLBIaazEGks4VeMECMO2mtqt2p1S5+c5UTcWU9gjN2w0L51kQKD99ebpXvN8xG2S9Ijp9PH6TtYmvbcGvD9vZrjFiGlWQ2bMXeuAh93woC7Pg9otBEOEqxS6ytsXwh5UYRMVBNjlh+tnz58S2bydPQViPBYGeF5VYwUK2zHZ7IuVeayGmTVf0R/LC1OtcnCgY+cEgesS7avOkxnjeWje+qrZrQupXT7CtuFaFT4x+x091SjZH3Vt3P3kbaVdxc5mttdtxw= X-MS-TrafficTypeDiagnostic: DB3EUR04HT005: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J4JxO2Bl6vtMrPJnuOKu685W8Bkycl9P1Thy6sfYKIgIXNKWE9mQpK/PowNZjcNkjpMWhDVerjA29ojrkUVtknWt8/5N8GwFJipkKFh5T55Loy6qux4Fo8CJ96EsM2VS96FKgaqx+EbjeDN/7lg809yNiuseR8IJQrRDaSwawsAigwhJ77p2lvu1IjxDT53FAOAdT7xWDbazecMlKs8Rc3lY5iojFKrmgMDeCt+5+DLo1D8tg8jo99mfpWMUyZMLDCU2X2hU24EWIeu6h2P3OAyM7d/MF9w2O9HFuNxxS64cGB1TCCUo31sIH/SNsx4mYXZnYq3MRJdrjXRb7km3jAsjxf0rk1wHobMlXDxGrZdHgA0hKIQE77msBlcVpGx6 X-MS-Exchange-AntiSpam-MessageData: 2fZOJ1GQJTifWOTRjNfXr5ZevSGpS6iT7s+5hqlyA3vQhK/x/WVP9XDDjhMWwiUiTsWND7OVoXWMYRnpZXdWMTjGE7YNNPPjuysn4SFY9cWx4DIyDulIKLOYb5+afd8Yakg1SlqzI8IAgpsbq6xSpw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 148c6312-8d46-4233-7330-08d91c396f1d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:45.5169 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT053.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT005 Subject: [FFmpeg-devel] [PATCH 38/39] fftools/ffprobe: Remove redundant check before avcodec_free_context() 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: NMI9ivJZMACY Besides being unnecessary it is also safer: If the error for an unrecognized option were triggered (which seems to be impossible right now), it might be that the stream whose codecpar is accessed is NULL. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 88e82a4195..2d452c212e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3078,8 +3078,7 @@ static void close_input_file(InputFile *ifile) /* close decoder for each stream */ for (i = 0; i < ifile->nb_streams; i++) - if (ifile->streams[i].st->codecpar->codec_id != AV_CODEC_ID_NONE) - avcodec_free_context(&ifile->streams[i].dec_ctx); + avcodec_free_context(&ifile->streams[i].dec_ctx); av_freep(&ifile->streams); ifile->nb_streams = 0;