From patchwork Fri Aug 13 07:18:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp566535iov; Fri, 13 Aug 2021 00:18:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcnNKKnHosWcbOoI3akKJ8I148m3TRO0Tuv5I4K/J6YVEhH4b2IURdWD5PGzskPYwwJd9k X-Received: by 2002:a05:6402:3550:: with SMTP id f16mr1303470edd.191.1628839116833; Fri, 13 Aug 2021 00:18:36 -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 x17si1056134ejj.676.2021.08.13.00.18.35; Fri, 13 Aug 2021 00:18:36 -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="PA/ERhSL"; 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 3FA8568A278; Fri, 13 Aug 2021 10:18:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064016.outbound.protection.outlook.com [40.92.64.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64D5A687FCE for ; Fri, 13 Aug 2021 10:18:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WqZTsgI5yYLuTQReC46jCVQMSuLA47V7xqn4JWjqc2Zx30bJDPpMwCKaQigg7syYpmGuoBi0q+DnV1nfBxpcmj3QvBv0IgaFNo7rtvb8+nZhRFdfmI2dQQrIEz6nQax9gdZCYNeheXCFqf/wNEM6kPW67PxBmt4mkXbPdqsDycI7iltkm7hLAPifUV4IFPNfr8n6E7JOE1d9uBc2lrvGb2cQTAzvyhFP/LuHD5vlSFRybB5SQ52AO7MN//D73wr8nk1ghANdQ/r09aF9j3DWRpNsIotQtDG2f6ABTTj7fvLSYjBv6xhe3QEHjo0A0feG2KlDByO6uJgM7JUVVSPP+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=qCNFhsxYbm9Lsm8IoftaZGoWBH/vVBR7XPxmOd74yzg=; b=RVy7sPShcPOKCLZrhkD+NDNCGWCwqQNJEP2L4X+Px+g1gnOcwU+6qSlPWtpHLU9HO6+1CUw22Lv1rR8w0nvmGtyyyuWraqF3Ihvvz+S4gTwql9aCvv6z7D2UrrtbvHlLUnkqp2gtr/RsBeZpNkv9fubgrt1LTKQzy1IWGxy0LvcGaMfOQ56NLRV+iVPk0QJNjSa7PVVygIXdToPpuj0gc3spi2JotgKJ2D3vqhV9JC30LQ088Cu5y6OXBxVgXCPgj/4zprAT04b+h2uFDsxoWhx0ueYcPYD7JPNuIzIQUGqexixHWIvQ5gDf+nwjWEqYPiV8j8/R/prQo4oSpclxkg== 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=qCNFhsxYbm9Lsm8IoftaZGoWBH/vVBR7XPxmOd74yzg=; b=PA/ERhSL+b35+HE3bndUR05hOS2vcVQhBkOl02TJ6x2+EAWN99ihZckbHL+odVG2JG5ynbra1JzwxowLxxT2BIKKBr0+ZV7sAoNFyNcMKcEv+KlMyEdi82gLj86Ux0RamvP6OrtmF1iT4U6ytcP5hFS9Yg7dxaQ2+iB5dmhXEqS7DizH45ojqri7p2l+bcAUkim0yX7BtJ2Lbzx2QVZCPbaEenDUi7LKBNM4fzKxp1wmgyXNtjR9Wg4cKkuK2wIzwQqP33a0fIY+R2DsE5R8yUJETUUBz36ZtRBdyLftqbPFRilwt1xw59WWhHRdqqlCHNIPN3WV26hrvb/6rnIUCA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6433.eurprd03.prod.outlook.com (2603:10a6:20b:1b8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Fri, 13 Aug 2021 07:18:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4415.019; Fri, 13 Aug 2021 07:18:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Aug 2021 09:18:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [9pt0PVwI/PNNeFmDESS4umDPTmtFutJo] X-ClientProxiedBy: ZR0P278CA0076.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210813071816.1569644-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.93.129) by ZR0P278CA0076.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 07:18:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dc01a19-9537-4619-75ad-08d95e2a8962 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIYCys9ix2kWGTyN2YRW6R0vYo3EEPQkJEipXNQXSmB6d50PtWMk1xb+MZkHYBHXVjDcNHxXUr/TfBI5hRvROUOwACn74ueWVQ0wW3KTqY64/JhlaoL8BeG1JyjZtujTenWa5DDVvOzOx3cbicA5iLn8oF7/HoL1EIdExluN1mjC0teGaJZiWeYh24wrLYtCYoeX7FEmxCRouh8N4nrXX08nMLy+WoT1Kx5NAlq3AfgGbwz25mIP+33hYnNrHO3317M3Q627Qz8cpKegL0DPakLJ95nrKZz+88lu3xNg5/NFvTD3xKdmAJQYBQFG+HeQB4S44vZ+mDPAKkslDsRL4uVHx1kruuej7zUqCMthI7ckXKhWYZV/Bl8djSN0Oh2VtySSDR8vyMPLQOKQZ/0PkttIraCW46ZrtMfDA/qUUuGRGMEb0wElOjLu1DKszK5pVvujSNLbK48hnLH51gIgaXJLyXUvie6WXIJqE2GKNeVbJReco/D3iqAmuIHQPc2o0bMzbHSY4MQM/LcMjTLud28dUyT+MnMFfyhXkiTlpO5yHWt2s6qIS99jWmrPsjAuzVox1EfGhLcLwGlwFaLIHESc1FeQ9uMjglVFLlkVBZbqyWUduxNN/rema+K+uFczkyDQ+kVmdx2uHXvXovExI0W0nK8Adea0W4xk20xZ/OttKz2t0MM5Jx6HbP1RHLywLq4jJcaZni6aw== X-MS-TrafficTypeDiagnostic: AM7PR03MB6433: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AC05lInA3984G/wlTZzfShM5oV/rKy/E3pwbPFga+Oie/vjpnkaeRMlygrTFSl9YXq9VP6omD5mmy3OepiSEL/6HvF4X4PqhaLibGt57lk5aQHvna+5Jbk8jkctzZC7dLS7W0Tu01JsidssLceW9gusVAumnQ/u4Ikr6vmqD99owkVhpjdntApddAKLBsGVmZ+zYJca5V/TC0piRd8dV+4gC0g3TVI52o2ginz2ftuPLvHRgmRegLkIFSq+Z0HF5O4VqPnU7C19G9jzdVVTmt6bd1LOuaZgBR9eynhWKVJmXrle6UyDpokhIEQBUJwkdkda6cTlwjKiPtuGGFpL32mjL+B0/gAqSLW+PwQJbpUpHVSGao6F1+cDLUIMM1ppBu4W+RHlrrj8BHfvrfR+ZOzi1NT0uolsBv215PQuDwhcNjrAbM+VPH8FZRfj89RaS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H6oFuGkAwzrT4TqgG5IlsTiPepZMzQP06cUjazCG0SRadnon14SA2qq58tP8g96xsmofKGgQmGAMwgF6xdaicZTuvZKbMzJ6KMfVLgG+3lDOuMsXFp64i9gJw4kVCSofBqfHQn+NcGzS1r6seYHOqw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dc01a19-9537-4619-75ad-08d95e2a8962 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 07:18:23.9579 (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: AM7PR03MB6433 Subject: [FFmpeg-devel] [PATCH] avutil/opt: Document actual behaviour of av_opt_copy a bit more 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: tR5lUb/IER6W In particular, document that av_opt_copy() always disentangles allocated options even on error; this guarantee is needed to e.g. properly free duplicated thread contexts in libavcodec on error. Signed-off-by: Andreas Rheinhardt --- Missing APIchanges entry and version bump (minor or micro?). libavutil/opt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavutil/opt.h b/libavutil/opt.h index 9e1e8ede06..2820435eec 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -790,9 +790,16 @@ int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags /** * Copy options from src object into dest object. * + * The underlying AVClass of both src and dest must coincide. The guarantee + * below does not apply if this is not fulfilled. + * * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object. * Original memory allocated for such options is freed unless both src and dest options points to the same memory. * + * Even on error it is guaranteed that allocated options from src and dest + * no longer alias each other afterwards; in particular calling av_opt_free() + * on both src and dest is safe afterwards if dest has been memdup'ed from src. + * * @param dest Object to copy from * @param src Object to copy into * @return 0 on success, negative on error