From patchwork Sat May 7 11:28:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35654 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2121925pzb; Sat, 7 May 2022 04:32:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVp3pProkbMCDIt6GcW1O1xdqjrN7a3TSc/hLFwJrLJr5E94CRK4fmmPpSlaRp4bMLUzyV X-Received: by 2002:a17:907:9494:b0:6f4:6af7:fb8f with SMTP id dm20-20020a170907949400b006f46af7fb8fmr6965920ejc.598.1651923124706; Sat, 07 May 2022 04:32:04 -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 dm8-20020a170907948800b006f39944bd6fsi6731071ejc.329.2022.05.07.04.32.04; Sat, 07 May 2022 04:32:04 -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=HV9kL8iT; 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 E066368B42F; Sat, 7 May 2022 14:29:56 +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 58D2368B455 for ; Sat, 7 May 2022 14:29:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PyEIkxP8ko6hmJbnbSfcuQhQVquFzlWn0AP94txL+k8drMnIffVpyr9vJkFyDZZ328lf33Mbj2B8Fy5i16gIN7rwamIK5cUosOqyUWfw6u/XpxgOvU0Fx/hpwLOyzMzaOEl6p/7p70Xy5o/SHmY0kWLh2LtM3cGlre8wLEptafIgVSttMzRtYmWBuKbBFfYHkonJ1UUkKRcC3w5OLyKTN+kK7xOOKuhe5Szwcr8G7ev3eWy8i0/00ZQCbAA5PXteEL5hAcWNZ/rEG7b4RwU706BHV6lPn0dhHCy269rernA7AntAmRqz9jOj/dVNMbUEAm2MooCjEGT8cr4pdUqgvw== 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=mbInTQ+ksAhRhm/gnrOOhFwLqy66ehD8B1OWS634jCI=; b=nApDPrX6gfKTKsajmaz+dsGeb6pMmQqaxeo5VHzUZF/6GTWrCfDf8hgpZ+dUUuSWTiUzIVfFXg/zPzUGIUczm+3+W0Bk+Kop2zf/1iiG6GHcDlsMJtTZtpR+FcUxU8hYstsj4Dry9ddfy1e1dDVGem65ALVe2WPM6XVEad4sUzXozOlFIVbdCgLUh3JIlta50bclKFmgAvHGUTmdVY5/oDQ+llhywUrLDJJKPXayQ+majiHK7VKz+Df4NbAcYR2B+jyvFIzKlMMbLyRcUf1Xp6LoX4aplDh1/Tnn12sbhr7KgswGqGJ/4M5PXMoT/151g8lyY/G1t2EWv00n53pBMQ== 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=mbInTQ+ksAhRhm/gnrOOhFwLqy66ehD8B1OWS634jCI=; b=HV9kL8iTWMH2DmuESRA/trGo5z+Fxci8Pl7hlnnJ75WiHlwCCSXmOWadaRSoK931FnUk+ul1syPyfQ8xLYlHcc850PrcBLsYVTnaZx3YVBdy/HDGTljcDNQk01mRz+kukm9ERaUy9le19IG/zKbMjFLVCLI2iizjzTpVRmOHw/oeY/sFsaahjsG5Vs5CIr5oB8CCLfDT4uuIQ1W4SmKngn1YKr3kVVF7qmlHKl6WJRytt97XPwHH3Etyu4tMY0RiVsS8YA+WgAiYN8/k85jb/79cigGAlJpbibnys4G6/PFhaPZrnWynZ1hF0Oi+xBAThmOosS5C68g1P02USpu3CA== 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:29:52 +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:29:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:06 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [B7E6dsQQsmCVm4bgmKE+aM9ZwCjoqR3R] 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-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa8fe9e6-3db5-466d-d685-08da301ce750 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVZjuqTokTVdg9S7+crVfX8r/bwmWSP8g5fjZYYyyi1HFGqhIgWF22Ps2zV8wpgnfiHpVlfmxzss4Fwr4KbNTKA2ESOmadxspn8/q3RF/EzfCNFxzipjnsMDmYAk5/SklQuRhcB4GH83CcN9H6+SI/AVx+h+GVjHdwlJJVzzpwPH1Y4aNmdHo9SktAL6ib7d+mybnNu9aHjy+VzMj+GoNI9AmaHWHb6ImXCDt2B0uSyIXTjsPOFRfGYkEqAlAgWnLhgXEuqU5OFfTjQhVXUyZcDjbj0+AGjw2zsciccfQwNhuXuV2AyW3KR2UHw/gB4p5PoJhMK8+rAv6eFE9RF4KixFeGKtaIk/FqNF52hB9moVbi26/rk49AAn0+oBaAGeuGzjd4aZzjsxU7lT1bD3UOAoASthjMgVrIjEqhCfGSW4XW0Pn0sjTojup79R9MsE+1d4a1oU1SWvzz2Nf9pnqpt6PG2/e0VhWHqhBMmrbpmgeTUVxD7IH7m4/6KPYUSOgfZ30DoW5bmajwb47VTglOa/ZX1zVxLV2QHzjq9NpE/deP+JXl5Zg6c229/yZWY5puoW3K4dVzQoj+qNrdf7aQYqLmGj2mbE3AooZVC6hyxbHTtPAJ266lvytlxxRP/3Hiw71rHSvmkXHv9PqCsWc3xlzZB4hxcPlEZm/9TQ8lNd0zRCO5lAmEovyZiOh1XYu97KkH7P81Re4/hkLibe7WgmXcIyKbajQc= X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T9YfUoQodWJBKLZ75i1Z6aAQNZmtTGSSpqRWYxrLEZmDJP3N9/HNN0vxalJC25pH5dsZTXnOSW18LB3TGQKdGn9vKz+ojv4Jfh/Q8Dcx2brcvK8aurExUbJ1Uh+/mwvMcCCD7SP6pqH7e+026w7asmZLr/PCSrYPdICdRpZqXGH8gbGM6+4G3cWV3X+PGRjHLvIA/+6H1a4YqKIFhNHvMa8TBqRVTHbxgQ2jLEh/anoHIsH+bTgfdDfHH/XOE4Sk8kdkeFLu82Q0IOixk4Y9xVbsVS7DQSzGyExHOIIeP1xPOL82MoKB8KrF6kZCQ2+S4ps0lK70Pir4PXZfgYux7ui5PORsBlagtMqjeFpdkiDbfJ+bActrw+nmNwRdt6OuBUCBOfa8/rFTQUcFmCepVJCZlXCFp9d2FJPaEKy+pPbalxpX7umyrC+lfZIyL33lNbYQiuqJoaOAfXuTo11s8138z67QktkbhUkyWFBhE6tVJgnhgA3FhXm69DYFDtzou+WMnsK05uMWQsTFcPkgsyF9BJZvjl1V1k684GvvPbGpkEz3ecwRsOYKKNmwjvSJBkjQz6c4pI25LE7833Opp7irsCC9WuPM4WdhikVy44fe+B4u6z4KCqvIYLmh8eFS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: feLTaFsSnd81PFRFOCDi0QnibC56H2e+BWcd/nF6queJ5O9AUZZpVqQ/eCdgov1DMkgORG8ndqGWlTQNQf2aNULlwIblqlxrOvjYWjAkDQkmZo2lDMOXH0rWtWyVohzws9mv30h4BSU0im8RuC+bjB1jBM026ctdVZqRdX8n9yg2QxKT1vRA/2bVrbleS5rl9C8tV/1C7nQ7FQ9Koftu51dYWqYkMfpa38gvE8TIQrYv5hxyXmOjLkE+hu62chi+3aG3C0m+JER7c0N4kwovrnBJKd0RlZjA02DCOY2bIL7IDktSnzDzk6n5tvN9ylqiXiHmQSut7e+1zIFjpf7x6VwiakqEYENLdRcaiGaUUxJwKqwXpQNaTyRn2A/woKPx1OgOIpYzLu2coxLhh49SsGQ+RpUdCZvQz/caN/IzkiR5UE5wwvhFebfTaskzWJAzhvulRNgG4kBsv01MNRQHzDGXakyAiiqqaoFbV3qWF7JKQpmviaLwUbFfx0kyEJzBe72mnPndtjUmhb/lpU8xU/EqitdCPDJSUxEs8NcuGpfrjs82b6qeexqNjPd4PWWQjey2KAn7cgTyU+vj0d1Z6CZACfi+lYU1dIX9guNmTdqGKp3XbI+1d/2RdenLtZB27X57oNABHp9vhS26jZSKt/n8CeksxjqED8ebpcNQMtNcglyvB/6CC+3sF+fEIhtk+hpQhQ/9X1a47buznLHET8wzvr+65bdP3KnRbz0t9g3CS4bsJ9ZgvjTGEErb81zLZgY6HMXM8+cfU6TxJA86qTYDtnyPhA+EyJmL5+GzP4x1md7cqq7kcHV+H3GxsKTXMN+HpD+gf1y2NjsAtNfGBgbiy7jXnDftxeg3UjbVuAdnl1dzit2vcfq1gR0E5ScUg5A6HYwI0o57i5rtYVg+kM6KRiIoDyBIOozAgfe54JNb0UVeZti7gSvd/5gwNRSexLwVi5SEKHTDc8omWrijGGExqqTMathguYv2If5fU4Un848IHomQlDYH43t5eJ9uPCm8XtXBiSnIbCltjgXQLNSXsbFDkfKYn1LSQ/XeJV7dbljdx0v+coRuo7YiNPuwPoaFXFCWGOBXKtTxK2OM69MCI3TGnoQnM7FpMnVBCTU6Jc9WCLrtyNpQ6GA0avGj+72OT9p+R7DusjpCeqgdrUy+9kAn9Lm+e64mrDEqaCnwEqIVkGMauH9nIgYHL7Dq/3wyIG/SVJy/Tow/YaQWVpdo3AQowJa/yFvr4UVZ0sNgiiEYMWSDQjHK1uwQ0BONBQL1hz8cxRYOch3vGeaEmr/2Th7T2/OCyvbsY3AVDJ+3Hwe96hWX8EFmwG7fkY2+m892ynSddvu6bmpUbp5i5B3cbGorc0e4ae6F1IXDl7CcvDriIffnO0sT0xbOoLxKozJee3yGa+Y6lYE/i3/e1pWniHsR9x79QhoYKW/Fdvf+RCUT1skMQf8VxpmDCrHq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa8fe9e6-3db5-466d-d685-08da301ce750 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:29:52.5804 (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 20/44] avformat/utils: Move av_format_inject_global_side_data to demux_utils.c 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: W1zurizqfEXb This function is only intended for demuxers (as calling it doesn't have any observable effect for a muxer). Signed-off-by: Andreas Rheinhardt --- libavformat/demux_utils.c | 10 ++++++++++ libavformat/utils.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index cfd6084d54..0ec9f3b2fa 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -73,3 +73,13 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba return chapter; } + +void av_format_inject_global_side_data(AVFormatContext *s) +{ + FFFormatContext *const si = ffformatcontext(s); + si->inject_global_side_data = 1; + for (unsigned i = 0; i < s->nb_streams; i++) { + AVStream *st = s->streams[i]; + ffstream(st)->inject_global_side_data = 1; + } +} diff --git a/libavformat/utils.c b/libavformat/utils.c index 1235315986..b20dad2458 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -63,16 +63,6 @@ int ff_unlock_avformat(void) return ff_mutex_unlock(&avformat_mutex) ? -1 : 0; } -void av_format_inject_global_side_data(AVFormatContext *s) -{ - FFFormatContext *const si = ffformatcontext(s); - si->inject_global_side_data = 1; - for (unsigned i = 0; i < s->nb_streams; i++) { - AVStream *st = s->streams[i]; - ffstream(st)->inject_global_side_data = 1; - } -} - int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src) { av_assert0(!dst->codec_whitelist &&