From patchwork Sat May 7 11:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35660 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2122316pzb; Sat, 7 May 2022 04:33:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy30Gq55XQtLO4WRwtpJDDK5d9qnD/BOQ4Q7sSYbc87awfQ8xAk8w7Qlx5VmemgwCWFthRq X-Received: by 2002:a05:6402:d52:b0:425:dda4:b676 with SMTP id ec18-20020a0564020d5200b00425dda4b676mr8021959edb.277.1651923187697; Sat, 07 May 2022 04:33:07 -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 mp41-20020a1709071b2900b006e844990dcdsi7701035ejc.334.2022.05.07.04.33.07; Sat, 07 May 2022 04:33:07 -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=qJwdoYwP; 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 197F868B49A; Sat, 7 May 2022 14:30:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068076.outbound.protection.outlook.com [40.92.68.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A10268B3D5 for ; Sat, 7 May 2022 14:30:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ocQijmXqh6azth0kIR1EjCvchOzCtgQvcscT6/6bw4yBaL5tj2Kn2P+ADLOSrb5rvGd28ggmuU9MPBy144r6lbsC4jMpsU4AGsZBAnzRXdzt+wjIekiqhxpwWAFzupUb49HWvLZtii/7b1PPUgPEsJ3btZ/hI2K/sJkm4Q0eDLmYHCHc7L0FekmstFccCKC9RBpDOzVv5do8jICpWcCj7GjAiFB5NT+GZtd2ivC4lo8gyANnZMceYHKqz7tGCKtEQljbumv2yyozcxfMrUvaM6xjAlrJwtJvcGbJSYU60dLc9dXEu1XGuzmTKc+wxyKxoVsEvanKUvjwUZUEHeJFGA== 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=XiGYhsYCD+qqDXI9iCMhZLT+RF6Y8DW/VYbwsthoS7I=; b=ofhMGcUiAniWVfM8k9Ceb2X97aVnpMfcvqqgOnhBzHm6Iv9sRBotjCxfmC1GvVKox23Gr6Gt41yo/qCa+cZ+BNNEWO43wnoY5v6ip9c3YfUnUiuqOf+T1IiuGtickqY0B+jprGcc6+ceFRdCR6ZIqG2QDoDqQnqMrnyR5LlRForV3yIyHeoTUe53C2nHZGkqY/H/aWyDJeW0nCu0w5irODe7iXYbfJ/hWuR/wg/O2OwRhRFZCimNUFxe29hYvPTm4ArKZbMAu5wkcVKA+nSoZR2haiB3rwxjeFBh+MbbpOJtOoGaEipRvnFr0rTR4M9hC0INUriebclDYoV6UFJIKw== 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=XiGYhsYCD+qqDXI9iCMhZLT+RF6Y8DW/VYbwsthoS7I=; b=qJwdoYwPGmVUWSb1dNrE45b8GPou2EvbH5ZEP6I3SV85hfq2oL3hzzEkxTUH1W4Ezq3HCCP/D0ns9jqyn+rxuPykmu0WK9W6nuyhKijrajoKbJToN6UcWq+Z1VwsnePXB7M+LHPvoe7DvwydVNMnGCTrYVI2EW7SPNR5KOXV7Tod+jxAVNvKBqAyp89r9vR7cUOusCNzt5i+blqQTPx8ZdtCM2/pKyshgarR9Nhi/l7GWLnSA4Ci11epSGO6JTRC0sLzbzhg1ncctv/D88rayoOB3vC2gL1Mvtmuk0SOIk5kLmdJMHnN3emvSDZFqAz1KD29RfiabYNvyXH/nYk+BA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR01MB3895.eurprd01.prod.exchangelabs.com (2603:10a6:6:4b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:30:20 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:30:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:12 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [StmNMTifC+fm1qMOanEK4MIwdXZcyosb] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07589bfa-159b-4dc0-71d1-08da301cf7aa X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvwPxT+mwCURHm2qGG32agMihYrekW/6IEUmDO8b6Jp8nGjKU+gdNuG6itHeSYLasl9No20N0yJVaI4hKcDz44jQynwruXZdGsYmy1Li8Ej/LOl3o8S86psK33yqJTVZYP2yvGifEnSeVdOU3jx9aWfKOB/K7CO01TCv8AXCAGqzm4w3pLpz1XySq7ZMHcmV8YTj8A52mpSFQo+5d2C7E8qdu2MmOQc7xD1jdh6NzyGYBktb4Et6xoOsTGgV28DGURwF12RdQ/Gfi12LDqCeSGYCosJQUnYuqnV3Y2EaFGcdGNys0JUrFOeQhHca/9KMo8uJgQGmB0ypyqb/r/0E6GJzJKJ7KfL7MPUPGT87W0ftY8anhvz6HPr8GEWd5FgsJwBX5QY0SW1qVeM8xUnsLaVbHL/Dq1li4Ae8C1iMirXc68U1bsAz03GZIEJBLKF9ypAqbCH79YASVNGOnMY2xeUPv818oMHQ1o6pvExol48hqRtVSJl1nh0Ga3ZaFo3HvMkhdE6QiSznxM2V39/3iXIle3BFipxwF435tE/2g0xINFIAX1c4JMOwgkAb+3A2ZTnOdgZJwOE+VYSQYBVTqwoPcvNfcXUDikyOAKEbaXS29EXXRBnjltcQjpTyshhNqxdE7XCIwCctfL2BOQeydVAomB5/zehuOQVYNhUO+QtO8T2S3lMWiQgCQIhK/ZI9ev3TySn6hUL5Zr2R85AKyhZPq4jQK6ay85d+IP5iAfqxCvv3Na2/3au1AEeiawKrGmlr1BO0r4tzeU9veq50SUN X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2gOc+tVrrJ7A7nNteXuI5BvjEl9BA8qZBhbzKMrSYaoS3VtTNoOxvz7Bm1mV0P8U9usHgCROrG/nLb9TsTOWdD70EESlkqIxkohu/QWftSB0/feAOEL/X4Z5KwHp5ASOlvswydIZ/NKgRN2UBxcpb5p1tzZuTamHfJe0so/6dvSgJ+uF6DRTIVLLvH+/sJWEceHucizF9B0KNAjj5PiXz+kOjE4/ldR0fXBn+iJYs9VAPEaDIWcsdcstkspdhGwoQzspQX/XmubCkj5Ek+Q5u2hCipX3mn1TniYwAmj/G1X489cYeorNOm3Qe2/RvBhYFcJE4nkTBzQkdVkEUs1wLhxF6C2Bqs9WD6crWoesQAx0tY9F0hgYRyNX+TFfIEzs/E+4hRifPePsY1BSFsO8C7r+l4ISXcELn97E8N4gzlS0H6v1wb5Nqspyzln69UsemEO1wdykbwoapw+lmLLv5rif8KBMZxcsA18UK2Zdy1fkr2VFTsljM3F8CzwlauhWzIBXcwNGvkAQb2xR/caH/BchFoiVQTzx/alsXtj/oDlTHIh6oznIv/1t1yMYlneQtkJj51W1FA9S+MWplYsL82G/fKiJis+ersv2O0MSKhvnaws2EFKjjkHypnKzBNDd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7VFupnajEpZivgfrnHqzsTcQtuti53eJwZiq9ETpDRob3jFzPV0Pw/09AVrJ6yHCUn6sjLQ8QAM2m/fPTf9wEozcodkfSdjP3ATXes6hcrX4W3UlPozeHN9huXCu3q9stX3kBDpygzO3jmBeGNFIotEuvQ4x8Fd3B+oNNAoFaWQtjQY037RN9vUoA3cK/yJaejX71Lai2Myo85bj7VOpIWCBCN9OPPBNjY/8j3FLePi169yvAjVT933tbfh072oMClO2VZiqX9mkPC3UIB8dav44uq2ezzY0GA8/PwGkbmIOIiBcVS/hO8vOt4Rj73z1EixNh1siEQuVKOA67DKPGHOdg6N9A3NnzmmIolPtZrxT7lD/1jQuyMTA2UDfA2Ucle/7QoE5wq7lVumOMqZFjMTTuSPUb8bUFIutKrEoX/odr6pW/w0TrM7Li7VhOJCffcFCL9Y9oOUouu4qAuZnIiB91sYfx1b6nTsR/V/7HWpR5KP81t1QJ6BbQ3WwQKbnqn6hCn887FRTgSdPZZFlL40ABtpeGL37bcypT2NqFgwhFliu1vbC0zdixQtKS1SAIBm/RdOiYYZ9smlcr8x04sD4GSPLLrSidxRL0Dau5U98sJ1j8kzEL1kCvoIbYzoWBndGobhi4FFu+/U3vymGmDAx8hTu6+m71ljegvXxVQhfIaIlaCnRZbd8J1TjirUEX5jj7eGhgZiUXsTlj/9PLvRy3GM3amkR+qHq7MH21lmfudVFtT7+afvYGGSJDwiAzOGFO3hbxt5LmgPLPyO3Ae97wKrQlTKzH9/RRNVhR00L08qcOieEDKBiSyOYsediIM0cw4gSeRTJ4VAu/MYMVRfD4k7K4KKi0T7tYZyaBdPvUAB/54Va4NmGbcKRS/rwtjgQ6d7mH3t1NngXIJPMQXCHag1D4xqdxKIWTJVliAc7XUdueG0cGIE31tjNrtYsn9hQ8xfx/1ln7PDi0F3eXKoRUoenkwnmSdRRDdC7p9pLHqLLruJazoIEVV4KWES0VlRe6Lcn6pRQDrdnrXsuzn7cQnsDnHESRky4TY6Bn/H/JtAZbBZMggRFCp+rrecCtC7jrJxOWfe5YkC2M++tnsMfW0mqLv602Z+P0OIKfrvklpQDJeW2sXVtl1K8nMb2dG0b5HPSdXea6fJuDDCEyICJEQK8Xa/o6KyaRIV6JA1COKF6cAlRaCoHz1ae7zeXo2GHnrUDJPoid4lxyEHBM+APCpjGmpwjAYcFmMcYrg8JUnP5me63o8S15Ea/InC9HLtMUMUdgBjIiGtw4OLKizhq+hjODXSXkehDdqpnsXYG6tto2AkGd6uBBeX6UPFsoO3jl4fwAzuP4WnK7+Tznw+MvDo8hECmaLBOADNvoRmXS3dVaF+z1PHgrs49VsKgFWTIFwQosjCzwZ6ZWagzmxtsreo1FxeI/NDMfoQE68bOuM7LuadC/t7YruCRJ7nY X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07589bfa-159b-4dc0-71d1-08da301cf7aa X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:30:20.0581 (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: DB6PR01MB3895 Subject: [FFmpeg-devel] [PATCH 26/44] avformat/internal: Make AVFormatContext* a logctx in ff_get_extradata 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: LyuFLkSuHbTE I.e. use void* instead of AVFormatContext*, because it is only used for logging. Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 2 +- libavformat/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 4392f17d71..d46368228c 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -659,7 +659,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size); * @param size size of extradata * @return >= 0 if OK, AVERROR_xxx on error */ -int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb, int size); +int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, int size); /** * Copies the whilelists from one context to the other diff --git a/libavformat/utils.c b/libavformat/utils.c index 98113086bd..00c0751195 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -359,7 +359,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size) return 0; } -int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb, int size) +int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, int size) { int ret = ff_alloc_extradata(par, size); if (ret < 0) @@ -368,7 +368,7 @@ int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb if (ret < 0) { av_freep(&par->extradata); par->extradata_size = 0; - av_log(s, AV_LOG_ERROR, "Failed to read extradata of size %d\n", size); + av_log(logctx, AV_LOG_ERROR, "Failed to read extradata of size %d\n", size); return ret; }