From patchwork Fri May 21 09:17:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp343395iof; Fri, 21 May 2021 02:24:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqdDqlwxpZ5V5e6Thw7oRLY7D+0ql3NDbcgk94w3PqW8abVlMpfJjygwhsApezg2C/m4wV X-Received: by 2002:a17:906:2dcd:: with SMTP id h13mr9610299eji.41.1621589065934; Fri, 21 May 2021 02:24:25 -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 c7si4654678eds.391.2021.05.21.02.24.25; Fri, 21 May 2021 02:24:25 -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=HByAXQxH; 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 0928868A0DE; Fri, 21 May 2021 12:19:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075081.outbound.protection.outlook.com [40.92.75.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 097CF689F38 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=IyX/iuz4ai2np8655a2jg8QjxmCOoEFJoIgpuXNs9J0g1L4FW46KIGts89tJKvDnGiy7AR8e7PGU245XL3h7LYf4zcWfOJZC0zLX+jASmhGwkR66iCZ/ErnIBGaqE/Q+dllwCuQ/IgHl3Z0QpWB+oH8h0n6gCGrxjl8u4UAOc492NADSojrgoJE4Kg12ULzIYDP9n4q1tZPlIuPDJv09/bT5jc8UUZGB/En9r0kZJydRR2H6/t7RmedrHxVnTyUOm4iR2i+96ls5cp9vcGoDS2+mpc0qYAKTj0a4fC82xbfuGH9QDV7A0TWTwVgoIprSceS/b2kw4xH9GSeB3TQhFA== 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=NIE2kADuJi7NAe6qTo15HAukhtZSfzHuPyiQmz3uN0Y=; b=c+BlbiRIcZOSV9+uXQJi2XPvLCdcKsfdy/lyh+hacKdLrpA5DZBb7KA0RWoUsilnlYuQj0vmck4Uv9CsaWZelQGsHEd+naSU1NGHZQ/QyNxJWZj1P70Cyl/p72okMC2l1dHzEvTvEkCVxIAbBiUoHwprKay9Wcv6M4STJlgtfT81L85+3IlBmmcfZTgPEcqRPBhrhVJQbMEcn6OZcogpQwCkMQqeggPyT/PwoKrlC4HkF8xVlQJWWX3ikUyw0HWEPpVf0rE2kBy2QUzW+8x8VDH4pI3620I+s/6gTmqH4NT+QRmql7zMkSYX4IbtekPZxCm/4iR4xJNCsVmF+kVF5Q== 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=NIE2kADuJi7NAe6qTo15HAukhtZSfzHuPyiQmz3uN0Y=; b=HByAXQxHN/f6tlynpFJLuhW5u1YSgx1InjGTcLnXaUqcYmAg7IfHMBkNtEysPd8WZnz8Q+CJXFl0WhdXBX/o1RyWgBwja/6g+WJp1U5IvcGJ/1MahKXJWnreunonI8b+r3U+U2efgJql1Vn/1fUm05y64jCx6a9u2iI+8epmFrJ5uZGmwXKUzH2RmAyDnWD3sdSe9t8uBnCJ0Vtzd9EjXcmBsKUG31Ow/MpZXIevBVoPz9VwFX3j3yemL0u5LoJFby/kN7eKxFJiAAmwRKOar7jXDsZmj15nBoQwrjYfsGa65UL2Ua8R0+a6efPm3as5puVLGZrs5IssNh2GVHtiTA== Received: from DB3EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::46) by DB3EUR04HT096.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::152) 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:AF6D78FF52F0D9930FA1C5622BAB0EB6AFFA84849ED6CF8870B1E222BB1F3395; UpperCasedChecksum:B87D474FA10EA506B4CE8817023FBB45AEAF254891635F9B754BA939426D5BE8; SizeAsReceived:7779; 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:42 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [CiUH2P75iZScFjFWf4TKdukhgk6t/ptb] 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-38-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:45 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 58db38ee-559c-4c57-87b1-08d91c396fb3 X-MS-Exchange-SLBlob-MailProps: Eluf6BVNkXkEjcXcRWGJSvGZmBz4cpByix8NdDwrO3CTeaLX+fGWrj6ehG++G9RwJve+oiIWzW81axuYlgLqzf4tqmH4fKsDuW3LGDMHYomfFywslrH5MuxraLcg8rvZx/JTPaKOQsFwRl2sVkrwucMS2pFav4cqfVhyJ54XBJQQGfdoqaJt88jxpeFSQ5Kx/k5h9cPcOQmGK8OMpK3oOSzPEvkRKkehg/FJ1b1vCHmGI6iNUxi8+6QsvzR78GGglrKD78h9cW45kuwzwq4/T8O/UPqER2VYnDwuD/iD1wbLCUJEotc0K9TANRrAyxBo64jhw549Y67MLldu+qECsNAWWBt+750Qq59CDW95nPUBmXIHaD4fMPNd0nP+9i3HoJt8JMk3F4cJCTWS1fIiUJ8wgoO6n0vj2qgZQtUMdVIVpptNHHsJJiMX/lO3i1lt2VZT0Gb5sbb+RAcx7PkxwxddMGTUMx90zQ7TqpOkckYM6OCYcDCcHgtvyo3pG2tsp4wkInAuTdapYyG1Dz7vZpNA1r+6uyeCQH2odCwgDnaC7Fft7dlNi8FQPc+GIlzoXpIwrVGAzh+pq72crcwFQ1H8hmeaHCDx8PIFJIHPkcn/s5uBKHNkj3ZKZKj18kWX8nlSnd86v9AesS9SubYtWw7K0+dgti8L X-MS-TrafficTypeDiagnostic: DB3EUR04HT096: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qgwRwUzMRdF3R3CZ04a992eUdmAjCEXlMmB4aJQoUkf/Ngxbf7Mld0QohLp2xY/TEr0Sx3nqhycwtrTqoeQImuQdN33QqXjI6HEqbNjUJ3NuGXYGhYZ3qxS5espFs3tAL70F7uvs7R0r/NgEl4iVG4c7dMm+8hzNI0MtZ17ePyroTmu360d0slaWHdIbCtN9QNAEiJ3+tWaxfN2CAcRLPFtxWmeoQHju1LsDlhf+lfoRMPgBT/2fOCAOqZFBEG5PXi5CkpMe41obM7rnZevDutz0+24WcNgzdJYAQcTf+tDynh1DvidT5/pC9SqXH4fiKLqv+Kh1p5LfGOvluFYajU5eaOkFbLFwMSH9un3sZksyPqA1eOhfw/sUQ6AJ2EF4d2pswp0jdvBtdDxggdvsA== X-MS-Exchange-AntiSpam-MessageData: Ah82lwhOjBDMzgoeHHL3fpGxZTpPuRpXLB1eWC0O7oat0SvR87i2lqRhFqOvK4Ka4ixsyhE7yRI0S8xvpqITWkvX7REwui6aSEhd0LzZHUSdcsJMKWfxTVyeiiaEllfv7mEA1B4QpSa0R2D7Vvi6aA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58db38ee-559c-4c57-87b1-08d91c396fb3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:46.4785 (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: DB3EUR04HT096 Subject: [FFmpeg-devel] [PATCH 39/39] avcodec/avcodec: Don't free options on failure in avcodec_open2() 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: 1dhw//W6/pEV Instead return the dictionary in the state it is at the time the error occurred. This is more in line with the description of this parameter and allows to notify the user of unrecognized options if an error happens lateron (which might very well be due to e.g. misspelled options). Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a65109e799..d369b30bbc 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -372,7 +372,6 @@ end: return ret; free_and_end: avcodec_close(avctx); - av_dict_free(options); goto end; }