From patchwork Tue Nov 9 18:01:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494132iob; Tue, 9 Nov 2021 10:03:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvLEenuDLQp6BF8EQXWVrglqXS8uOkbv8Y315Yomf7INPNgos9tZVErjG8q5uWCFbjBC4q X-Received: by 2002:ac2:5d69:: with SMTP id h9mr8769735lft.675.1636481017807; Tue, 09 Nov 2021 10:03:37 -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 nb27si35269903ejc.336.2021.11.09.10.03.37; Tue, 09 Nov 2021 10:03:37 -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=jrtwFvlo; 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 CA98168ADF7; Tue, 9 Nov 2021 20:02:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067058.outbound.protection.outlook.com [40.92.67.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E54C68ACAE for ; Tue, 9 Nov 2021 20:02:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HTwC0a+fTtN21ierKZpUR2onsjKOMBUfwnKddFN9HBhy76xA9IdNdbnV24NlXdGlaCq1ad0Ej9o2VsnMsbNBtPBIC3yINsOmK+lWKndWn6i94rUvKDQhUYcQ9wvhbqI4boepRQPMYglrCpdV0MtwchdMJ0n54omHb1SgKWVpXNcNva98Q8NfGxL2BWRnv2jTXc2ok1kV0LZlqeT6CsuYlRlpVduyDkrrCt2NLf0oqfeU/t7f8Sf/NNnyBE8Phrnthti4mD1idYzWPn3NsYhI3qjRdz9VYjWKl6zyeYDwCIOLQpIDHxXjCk8TuxRy4XSsN+gSNuxeK45C+4gybg/P9w== 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=j5TTQ10RiHBzxq3wB97XqN/e5bsFiljO04FJuORE9t4=; b=c1Qtvy2mOAfyI7dI5ecfh6i9n8IaS06HjMLmkdx8a1ijfjaD5BS9i1JaNujGWaMtvW44xBO+b4XN8B1kDeRQyOO+3FgMNDxcE8Pcs+5U2YUkApR4UCqCFpGs9/QcjTw1r/V9+gP+OZ1yDRsG7cpcrCGES6nNR+qyM9QS0/Beox88mKjgRB8WLoMcA7bjVYZ/M9pGYrF6iVdWFwbIAdReTsu8av0Aux6N4Z/quwQ5AM1Vs6KX+kNtC0WLSZRlbsqW4Q5LybOWekyo0FWnltcGGrg0SP9jyy+U29WFoVuh4SABxi99TS6qGR/x8j5MqvvhP1MRcHZGBh+Zpnua2x5/Tw== 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=j5TTQ10RiHBzxq3wB97XqN/e5bsFiljO04FJuORE9t4=; b=jrtwFvloAJaDe9iUSAta1qna2xLcmYFp+1O7ziuaEuTLY6cHDZOVxe5DcJFFER1oYRaJQkmJ/WeAnl9ySoWs+dRFXMkqD9cpuMC5AANRwSXjkZfliq9sXeX0A9+8xhY47NeVJap9JsOjEQr+JGbwz4ppQS5HeMULb5TlWUeTC2KlINHtK9S5bfk5tGSb8Pskz4G54Iv+GqIDTLQgSTsccsb+spu154kA5cSeZRyhJbhrpi9zbbeSAkJwkzCYZx/S13BGV9EcfxKbXjuyxlpAHDFpEQA7Z0J4+pLi/fY9cZ4kjMqVZh70z3KA5iLj8XKc+QYUkCNXOxp0JU0X4Rj6cw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:18 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:44 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [cFrQ5u0QlD5ZbQZrkTEXkDLNSGRe22F+] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84c919e5-c251-45dc-ee99-08d9a3ab11b9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+WrNrXy0ABZ6DlL0F8SVjrzBd0PRgWnXcudK3+zMK5OpERhy7/Ij4y84NCxtXvTJ9nmUfa2p3CF6ba21CSGEtr26bgsmOmcyGx3lhEN+VqQdTR3c9N/PwGT3KE3nUmuaKi1NEvEAfqTBOuyqXub/d7rqBIg05w3IYfu/GeEd649yyKl/uFYIOnOvJoMtqJupxxEf4G9NjiDPrcGZANPFrD/PdUjx/H2XQInMtV9xhbH8dsmVSq5bT9zjuCjtXCUHSad/XjQ4xKaXDnyd5AqQt4o/Uu3NA3C5KpaiPjSR7VXVmhjU9pvIA0pXLTf1+HAwUBZc6CtDFBncKcn2tsAXjqdoXKV+2YQ7yT6oEC3rezq7gCmfGW473neRbsOQvf6yL9sctvCAdbKbCzUuPGOGWUBueUKTa2gvjWm9g4vUNttYQ1NOk4V8P2Ecml/TAmFikFt30M3GIj4UCTnHeixN6JXCrt6ZIXjIZlHp3n/8Nj6R4/Q5+hYspfIsgsFoxXDYb9uKY3Rap2HY9X1zLHrvP/uJihZFJoo/8HaWhhtvnYD4VGWz+bn7K8sM23Go9JGzR9fL02HTLNHZgeIKQ1A/HBMiRlPxaqWcjM6NM85wS/lGmykm8L2o0p87Xm5tc8B5GzqnpqvMdZutcIC03Go2OmDaOuUUR70pTo7LzgZ5MyBP9DAUNCM4RgCPIAQiDgcNusxfL9Ranupw= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qyj2uWhoSNzI4feputBT5evys+D4UhM87U96DKWFAtghdVktp7ol+DoXI/Nbw3+mDhTHYkgKCT+ThbJLpLqBg++M1U8qDVeQzJCHT2ZfCibSvMNApfXiX/3DET3xj6HTDPpi3KRNQsZ8S3piHakcRWOakb1NBKyuxRVifDzzXBlEo5QmzIhDUQZoKDtQnj51Ft6dcNDnWhjhg5InLOtlHp9uocPSNcKqxUCt3wH0RK2Xo+73+QZ+9UXmBw7DdxzJtQA07EAN5Za+o8Mi7DV9CjJ8xDmkVHbRSbpiLtt52Mp2p0SX1zx+3IGFjarYVas3Hakt+cZf7Vl3bjLr+tHIf95FnJ3BeswoqNV13HR3kC6+6MngWV9PUwwJ1owXeFrhuNM6tOy4pxRnjd3jERB26fwt5HzgLDYsxKGpJkanH3VOfkwu1NoORgfRvYYubj1VBDxxQ6BQgUOYScbY+BVO3Ni6h2lKEB9ETsBPwjDf0dYf6KmqyxYoBj+jxzw0JX0HqMA1BuaMJV1e2Q8YM5oaI3WQ31b1Ahc4inccyezjazg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ft11+bIti2MXQy//PjfAizbThZtwoRuK+6Wt0x2zKhtbetjt1ITmnLYqZnnAAyJlcxxA0y+KSXsJvByGiCpQFnEevK77n8n01gWTnBIMAH7szOFDF7AevhYJQ5HrRldySgtjMaHNo4Cuka2FoPLHDTQwTLtRXbbrVb90TX6yhQ5qHDWsNxcqqkFlS4yDAiyRExIFDjTE9N5JK1LGwdYWU1owC91DZAAYEPB3mH0QVFUKsBNNxd5KBst/+AGp1PCiYq4jlMWx8Qy5gGLzKE/tU+a27+6insG6bHOxjdnCzqvidUQqy+Z1S/7zel98tyEGJHApPLpRw4GVsMwLaZm+zR0VOcaPJSLAinHP5xmX6j76cBSaa32UqD7myM7m+gkcpAEodqC/p1RJizwzEqbtCN5gTP58uWREDxyNDLZbGz0VnxceyCufAi1RdRxFlkaHM0AeM7N5HnfzHZnzaN/k9JMoFZjV+40SjmA3PZtHJCZSwF7i+tMsIYiVsCJTEvjUY722CVHZj2Og39kD5fvJM6xBV9TZk3hrOH1t1PL3vkhl7AWQaA0xn02UY7GpRRhi3Vtr0l0SuI1K1a9Kl4O3qTzH9BCqIP9DmIjVtjsFgLWxAj1XhCwQ8xVBFp9/000GXKwqxme6yXMH+9+qEbTWN2+S8D7S4TaLvbmHmyEou4jXVeR0zzWutVdVRQmNtBIDo7aXazzdeMhAADG+Sv9Wyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84c919e5-c251-45dc-ee99-08d9a3ab11b9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:18.3620 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 06/17] avformat/mxfenc: 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: qJ2/+EEIji7W The MXF muxers only write the header after they have received a packet; the actual write_header function does not write anything. So make an init function out of it. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index fd9e2c4c48..a6535eb43f 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2500,7 +2500,7 @@ static int mxf_init_timecode(AVFormatContext *s, AVStream *st, AVRational tbc) return av_timecode_init(&mxf->tc, av_inv_q(tbc), 0, 0, s); } -static int mxf_write_header(AVFormatContext *s) +static int mxf_init(AVFormatContext *s) { MXFContext *mxf = s->priv_data; int i, ret; @@ -3261,7 +3261,7 @@ const AVOutputFormat ff_mxf_muxer = { .priv_data_size = sizeof(MXFContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_MPEG2VIDEO, - .write_header = mxf_write_header, + .init = mxf_init, .check_bitstream = mxf_check_bitstream, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, @@ -3278,7 +3278,7 @@ const AVOutputFormat ff_mxf_d10_muxer = { .priv_data_size = sizeof(MXFContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_MPEG2VIDEO, - .write_header = mxf_write_header, + .init = mxf_init, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, .deinit = mxf_deinit, @@ -3295,7 +3295,7 @@ const AVOutputFormat ff_mxf_opatom_muxer = { .priv_data_size = sizeof(MXFContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_DNXHD, - .write_header = mxf_write_header, + .init = mxf_init, .check_bitstream = mxf_check_bitstream, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer,