From patchwork Sat Dec 18 10:59:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32701 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2457337iog; Sat, 18 Dec 2021 03:00:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMrbkH23iOqVrdtLgMrKiHf7Wre1LoOCcxY5RZlwZkljfmQLEjATi3E6Me6lVhbiAxiRUs X-Received: by 2002:aa7:cfd5:: with SMTP id r21mr6659070edy.98.1639825213768; Sat, 18 Dec 2021 03:00:13 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb9si5082584ejb.574.2021.12.18.03.00.13; Sat, 18 Dec 2021 03:00:13 -0800 (PST) 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=ccdBkFcR; 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 659F668AF5B; Sat, 18 Dec 2021 13:00:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065063.outbound.protection.outlook.com [40.92.65.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D7CF68AF52 for ; Sat, 18 Dec 2021 13:00:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E2G+AuDrlqabeCLegJx0nhFcF4x+JKZ9WrHPL0TAnlAt3aXuz9tB5P7dq6yfxLNvJQ3p9pCgSvuSUeQKwFJ1O22tsCq+TdEvlw2/DvV4UTWWIiiOB9qi6iX/Igo9lDPF5/inoqvX521jwNRCUgModH+bdXUES2gUn69X8iOVT/N+KiH+PYR7wjQ2ZmjFP2ARd+4fPWuZkuimd/t14Lb3x7IbEHGMUr4YdNdoyCCAPBkyMWOs5Zf8GgdSfxwyBgrEEakpDuO8Y7SrZMg3klr2RtLtEB5NDfnzQhdZd7ddln4KLvSKsSwpWI6IbxC91vUo7s4IFvy0s5D9VR9+ZKSd/Q== 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=xqvMnJVSXFw6ZIi/QE6XptL7mtlUKJJZzXRF1yT31ws=; b=oMbvocrYEUdLgRDoY+bxpqHu5TncOauE9iHRxPPbjB/ZHdXR2xv00o+2Eu7zo4ZH6U5LmEzAKcvN9zsDlfsEI2id2vB7v58B6NmTJZu+qlCnucRplAj6QG5sSFyAKImPHgWA5RHbFj/NGzFgy1l5b1BVKSP9VBUXhjnFRw3Y8Gmb3UAessI392FRdI4U9OAH6J1Q8exF9CsT92c/DLhvmH5K4Sy0C5oBycaQXGC6gJ5eqFiQHNfdlld2czC0BXRdYFwrDBi73IMlihvYZ4ShOYLvXCL1+uX+PGiKeP+5wu7rc+IlRwpDquiyABjgGEkxbSBPj21bUy0aA+GbgKOFAg== 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=xqvMnJVSXFw6ZIi/QE6XptL7mtlUKJJZzXRF1yT31ws=; b=ccdBkFcRqcf74DjZPi1Iul5e3Go9O1L+6Yo6UwCxhWwBmCmTEdWsi0x2Jw54U3FOSFuC2qm5OVJMWlU4v30Rx2Lm8gjlPdX0nERFyd5pG1A5U7lCSHEvigfTDtJPnArHPqzgHTkgqxe4+ASWBL/FOjnJByxELaSF2Y56C0Nvs1yMOmXSdPcEw0vOH8sxpLNVm5aT9Ni4YnnqR0xTtE8GSyUbpI6tk2RO9r9XTWTNMjwAoGD7ns/WDaoPT98tm9/qGOe8+EMcslHk8u6Lxpp0S/qx/UIQU85ZHsl94eYkk4xOM8NuDhNK0H+aaVVkGTxI/FYspAcN+8tztePVes/PrA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4373.eurprd03.prod.outlook.com (2603:10a6:20b:10::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Sat, 18 Dec 2021 11:00:02 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.017; Sat, 18 Dec 2021 11:00:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Dec 2021 11:59:50 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [L89NBf/8y+y3Vk6Uu9IsZK7PYErq8YJ+] X-ClientProxiedBy: AS9PR06CA0294.eurprd06.prod.outlook.com (2603:10a6:20b:45a::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211218105950.1135890-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3848ee74-775d-46a1-bfd0-08d9c2158aac X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlAumaUXe9NNkcn3Al6sNWoIYogjWDSpgvO1yX7I62gEe78b67UKmCtt7I1XF+l5LgASnDugljtSW394YktoK74YNJVr1xZEfA/baMBxgn6ZZ6xyXipapciD01vKjBnGQgYb9d83mhM8hnvgYUh582lV8JJOIsLRHpue6LOzTXDZX3Ae1HUmWOmDo0/wop8kPATRK1Ml7M0YbFJBCWDlh/Jz9SA5ssl/xiozjuJ1r6X4TbOxIwxEUjeEavGwNYELmmoRnQWa5LXieJXt3QvoMWkyTgW6SP6i41nrODeACfB6x+MpWqOkn0Z/DZE/0FuW39dPTGPbi2WtbPmZhAnNRvukE0/QG6yhw5o7PYWb0gXEOUSkdQ+8EA8pElIgOvNP8iE/xdTOFzfRPR0CiSp/OlC8fdlrd5mEsUmPDFM8KTLkHcWQ1S/VEvSV369Nwmdf2rzgFyNcV/rUOvuaavwMlH3C5RUW86djwPYLgJ19+3XovNyhTX0X5kAMT6Joj5h9svFwH8BK+6WWJVKet5H7PUZMNWRpNUGaJcWxYs/S81twzKr2LMlk04WKrIDUalIe1W9sbt89o9s6801XMRuE6DT3978rPTmOX5Ugu8D0/i723UmCD0PW2b8Wum7A62nQq+pgVRnOXHSFJzYSedoIEJ1dbyPNdfeLIBouz+L09M/+TtFBAwGP1ZK4C7JoxMb7qk5BaglUdqCVM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4373:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HrpaUB9z9gByF7X8x6My/bNc92DWQ7dkNZsk0PA5PLID7YPoPkpbUCrjbtmbQUQD99R5eHg6OEdXnBfR2wLfF2sokdZR6wLxZVZc70zDQk3n7X4rbnMFZJPDgDplOhIxLplwanYJJ7BwdLC1kff1aHcg9tpjTH6ZZwTVtK90gN8iLMfgRCbxFTUkkftS7lfYdEUI1qDwdKTC7hscOOyVMbeX2p2JPq3qRsz0FqjwklOe6xhEFSuQJsLnSaqJOXN6Rh+WWeqQYmaw8U5M6iMzeKF+wjL0qzHCT0qFLft9fgO2OkixD9fC1ohotdB/HMwsu7FGxPoVNLrT6lb9eS0ljQU9xN4bHCyl/pUZ0xr3XN6CQUWf4JqcUQDP5R4aXZXQ0qgSJT8eUk0s0Trz2dcour7zRf1rK7WQD56RrxQAlFlQtqPRIrAXwLo9FTeZ6LEUQdXX8tQ0hotmuDcvCuEKvdFnGygQqnUboycpKksuFYzX7SXrKCKUCkxOmJMV6xax80EwJW/VkMZu14ips1XtkkcdAIWZPUlI8XXOBhJGSCqAad+hKsVDuqFXSVaE0QqsJovXomsK1sHc9PXMB6hFHQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HyVdvU0Ae8F1In5Dwt5OCSS7bJGyOvV96Vm/o6bYBfrks3mO5CJR7CCiQFrFty/Cz0xhWOeZQkv1KQF/xagf6x4WbnqE51ZnBgfAzXQk5oNLQR5aTc5Gc+0QgTFNrpIlip3ecPQ7+rKD/s7hPzZkb85PYrz0S46VXniM8Rkcw1eBbBiSdb6rJ7vXHEqWwMkhB96gFDcr46ApAlMzxZBorb2WG3U26OSIdsvs+EpjR0U1k44GL+wGOvuc7lYnMLwyQPVnxUVJLV+1zEChe9EG6Rl8EJXg1s9f/mLyJpSWv6CLX9SvdUgJsFKPCjvsHQBlUqPn/OUATcToGdf1mulOmtSluYDwLMlBGCgBFivwwJqPtgt2yPEcZTtfoK0sdRX1sLOVHoRSGi24Lcgs3TT2YfxjHSRphGuvedVU2+000Rdls3W443TGba8GyBVmtMD7rS/HgsBvNtGugIGsbsaa6YgPUKhcScw9kNQ8z37dQ9MtPY0gNEYkSo/zb2zlTuo4wT7ptyL1xHR8O3OCwOql+M30n4qrtzjJEwnm5b6ebjr0gJk8PTzWcK9/9PbpMCA2dZ8BFK5r1GTeWUwStyO8j3t95jBG3AjOSRZ3WbnW+UVNbWZ2bCo75IOgSvvkC3sSz6LRwupKRs31dGssOhH1iompgtdoV4Z3Am/+vh3ojeR8WMeqdMeBkTPYUqNk2EmbhAL4QxbuDIhcR+dzDsoqx8uEvIXSVq2HwZG21fEmOzmUy0/zUK6jL4w8ihqEFb53QVl4c7h3VoulvXxfgqGh+1VxyHJJkMkPBJOJiqGuIyl7Jqe7Pxt7gG/M0l59i39XiZz0VKsX+IBiKChiZat+d8NjIDSwquHlMTfAVsgJ6fdOOvUvG+jMBjtOv9llC/BM0Qrd0vIfJvNAqVwWZbKinuUVtbpvFgdVGJdRFUK5grzQGISvRFnaVWZAhIs7mVP6yoMBABz8e8weIcv+89Cp1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3848ee74-775d-46a1-bfd0-08d9c2158aac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2021 11:00:02.8345 (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: AM6PR03MB4373 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/wvenc: Make init function out of write_header 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: luOYOh1sHaz3 Signed-off-by: Andreas Rheinhardt --- libavformat/wvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/wvenc.c b/libavformat/wvenc.c index 9a42f71440..0dca2f7996 100644 --- a/libavformat/wvenc.c +++ b/libavformat/wvenc.c @@ -30,7 +30,7 @@ typedef struct WvMuxContext { int64_t samples; } WvMuxContext; -static av_cold int wv_write_header(AVFormatContext *ctx) +static av_cold int wv_init(AVFormatContext *ctx) { if (ctx->nb_streams > 1 || ctx->streams[0]->codecpar->codec_id != AV_CODEC_ID_WAVPACK) { @@ -84,7 +84,7 @@ const AVOutputFormat ff_wv_muxer = { .priv_data_size = sizeof(WvMuxContext), .audio_codec = AV_CODEC_ID_WAVPACK, .video_codec = AV_CODEC_ID_NONE, - .write_header = wv_write_header, + .init = wv_init, .write_packet = wv_write_packet, .write_trailer = wv_write_trailer, .flags = AVFMT_NOTIMESTAMPS,