From patchwork Fri Aug 27 14:27:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29811 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1512790iov; Fri, 27 Aug 2021 07:28:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWe8h0HBT7XYeXP+JX/FKKS7XCRd6lebDCmAsOE4HYZ+K13OMu5nqXOwDNgTa4pDerwvvf X-Received: by 2002:aa7:c311:: with SMTP id l17mr10199964edq.320.1630074539641; Fri, 27 Aug 2021 07:28:59 -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 gn9si2196055ejc.550.2021.08.27.07.28.59; Fri, 27 Aug 2021 07:28:59 -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="sW/2UZv5"; 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 198F768A2DE; Fri, 27 Aug 2021 17:28:01 +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-oln040092074075.outbound.protection.outlook.com [40.92.74.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 079446809A7 for ; Fri, 27 Aug 2021 17:27:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ffzygpeGeSYDIIi3TX1RPPNH/I5CNkHtx5hW9yQrvysjU1a3vsfTNAHqdofAOz8F+N8HjwiMh6EfVE6aGuweKOhhHVRWhzFk7bMxghUK3iC7x3DVmJkVZ1/jQ0Vr5BnzVAgCl0E2pRMXMWwkEiE4CH774K17nSBtwJI7pLYHNq13eE4k/sxDAJ5xwfPqMmnZeRAFcDRhXAl0BEUPBI3heScdIO+5W+teKjzRC7sS4OkPAFKlS0cKVEA7r/fEcLwdkpvS8Pgsnxp6bUOHM7Q1yOqjMAeD3medg74tH5XDjQV3rU5diHtxfOyuu1E7FntsB/mPjx9i/k6JRA+IPj+hIQ== 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=VeINex0t6dpBRySrzdp+3MSidyKyjSSBZD/nBHFlKK8=; b=X6sWA26q0h/XQ9HqfRk2o8oyYKdTkSQEv2PmG3q0tpeA1JzoJ5CO1iuo0Ovfn0Vp/VhKoT7e4n8HI4kejv4B5jPLfoZOIvapQ+ZT5hQnvhfkR8y1a0kN/a/E4oJQGC0a+7h+DqfJ5k5nsf4U452Q2Z/p5BLSZxMWy+mbrDE4nH4QR9w/U+CJ/mt+MfjTtfQKZQQ7gzmUcwXsdW7etQ474EK8zwqemv2JAAWvnZVfP6VBkI17/C2bycCfH0PUCH154noQBJMXf2yeWo4Rvj2S1bcc89KXC3/9D7YpqD+SSF1c8joQNKGPZItFn8x3iZrULW5UE5mYcQhWOsjkZG26hg== 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=VeINex0t6dpBRySrzdp+3MSidyKyjSSBZD/nBHFlKK8=; b=sW/2UZv5xSIQxw44RCnpg9LkCBP+7RAZW322Wa1SED1BWp5kjGZKUGECsOI7584wklI7CDCT+w9IaBM7ub/SgVmgfFSnGQHMAIy6xkbhWFXj8S3v/zMCH6bJtppjIoM4Od/RGYOw6W+HpvXKlzXJ2PieJ4f/h+wAmF+4DdNJaxM6SQo2fsBITgUeOwsAdH7xG+HSdEKXBSyamFgwSSUNf+Zy2dWMdf41PoSfUESx5v/8rYsVDZr10c4aRptSB+uf10LUKP7/IwoqQaS2pQ/cjxh85FQ4SdyuK1quSslYlPTYLzEdXGf9sTmHl+7vqE3u2E2NSOb4gM12SM3PEOsmfw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3687.eurprd03.prod.outlook.com (2603:10a6:209:30::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Fri, 27 Aug 2021 14:27:44 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:27:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [B+4AcitM7lzIladG9ttx6Lg5ZJChPNUH] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:27:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9dc97ad-5560-43b3-a44e-08d96966d580 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXOVIHST31EzKLNwg5cTLby6aWJZts8XpQXsrgEofaDJPE/1hcylMPsaQ/hCOQckZEUfVhbIP0+bVR+2qVwRe5j5wBtaE8/UegX9T4RPUctzX890DOSWTtymyMV9g1ktoephXbH/iaJIESwl7IcM/3fQGzigUWmVF86Rf+mGbPl7AxiqshTBAbtw6M/F70so7D1IxUtlxatZhL821fwpxQAdjszB1yqVmDJMILa1yYt19AJLh7l8Ra+igL57PH85uGN0mT7+QX5ExUPgwYdJSMCV09M4VsmkKFaIRQ1w5QLBIf83IQDEsyqLiLElnsyCuUlr736aEcWU9tsOeHeW+pE3w3lEVypdogvo5ZMrS5g4pX3ZAR52gfyTsPC1haJaPHAtd3jL/Tfsq5GTwQY8rVUz1N6mIxluRMVsnPpPsG8mT6WUsrBt6fRqKyabq692vfFUMHpaoXzMXhmb0JY5XkhdQTihnT7JFOpwufyJ9arO1oVnqIHD16sFd1NWpWnaqJv7rQpFZ7tDZSIwG7kYHC9dT+25thYhymWHc2CVdV6VKMulmq1TOw6t64lRnhgH3J/Z27UBbs/J+hb52q0rczSqBqtd52ExDAIK1zQcdFZ1hwD8t7NVbQNyc8+sT9jWgqHtUcwf2CJxs6zOaiLLHl6btUpSen2kOEp8GmQwNxo9WPhukzd2ZOPwz+QwxyUF3lpIlxXQI/72ZOf75mUZx530eAeQa6Cf8w= X-MS-TrafficTypeDiagnostic: AM6PR03MB3687: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EFA49/Yub/DDdweuFgRiR//YG4hk8kbzlh2phGVZ+VYJ7J8BJSx2+8PBB2ITzF5MPL3p6Ve6mxhiYOnQg4Bq0fMekDFZx2wZQkAeerbjK62ZPu1va96Pc+RS8yUi/IwHynGUCgE5RiO4brJ6iSLUSP3jkVfaLPrFN1wrLORXP6vjw2YEhvOzSFKa29kQRz9U3Fz+jPptpOJj40rFp16hla0DLPfy4m48I/+2gZqLAq0DfspWZS4HxXr6YbLKO5Hs4bIsxeXSNEGNEDJmrf6CsPOBhRkQVbp8b712l+/GTlANvgCMLXMogYPIPYcvj6yCHlPOeB0RTrNUXS+SwvmQs75Q6AQV6tcsJ0yEDbDBux2qkBZjWdv4KJdKKDKjW8h5v1hmOE3mRvlxdORdvxtfmRkpcV8D4/fIwAWRHMglU87ieJnfXV+gEXS7lAJjUUHC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: txy4oktWovxrj1r3N/RWoxiJrbD4QNKVMnWk14+l4lpZdZT2Abnl/tJIuHCVQC3ngYexH2jF7Ba/Iof7XcV9s1il3icDJ7Fd2pGCzLFaPwYEqBET8FgUKFcG7Mvej2BBWIrApsSfaQAZL9tcQfM7kQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9dc97ad-5560-43b3-a44e-08d96966d580 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:27:44.1543 (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: AM6PR03MB3687 Subject: [FFmpeg-devel] [PATCH 08/25] avformat/utils: Remove always-false check 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: eQCtRo9BrgZI AVFormatContext.internal is already allocated by avformat_alloc_context() on success; and on error, avformat_alloc_context() cleans up manually without avformat_free_context(). Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 4caa3017fb..7d7fd16257 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1742,8 +1742,6 @@ return_packet: /* XXX: suppress the packet queue */ static void flush_packet_queue(AVFormatContext *s) { - if (!s->internal) - return; avpriv_packet_list_free(&s->internal->parse_queue, &s->internal->parse_queue_end); avpriv_packet_list_free(&s->internal->packet_buffer, &s->internal->packet_buffer_end); avpriv_packet_list_free(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end);