From patchwork Mon Oct 30 10:10:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44437 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp1315711pzb; Mon, 30 Oct 2023 03:09:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnIuvbibYK7houF6ejfi0dTUSP1u5VMc3w1llR/K2tpub8g4IbCwd3JctXBwagZn3Bbxzy X-Received: by 2002:a17:907:2da7:b0:9bd:d1e8:57f1 with SMTP id gt39-20020a1709072da700b009bdd1e857f1mr9322493ejc.50.1698660554091; Mon, 30 Oct 2023 03:09:14 -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 bf1-20020a170907098100b0099396546ffesi3167972ejc.768.2023.10.30.03.09.13; Mon, 30 Oct 2023 03:09:14 -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=iEheXXm7; 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 5CB1E68CC01; Mon, 30 Oct 2023 12:09:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2087.outbound.protection.outlook.com [40.92.73.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CC5B68CA66 for ; Mon, 30 Oct 2023 12:09:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kbamV//0u98TAAOz43MQqZwCTM0BaSB3XMqm6XolbhhH0o4ewNcSbK3ANWdmL/mvluRmyasqK4t4KEXDUe7Hk/TxWIUe85g0sqLnTGyfL8QWzzDgHmSzEMSov4TJ6zpZC89uhJ3lZiy59t0edFujBrMW90RMzP6B6Sv1FzHpxQkQ9Kv5MsTwhaXwOUXgEXCTktUPf0xCiPcxdE3Il2SMAoSj5JC4BnD+6Xc5S9tDHJpWGARY93eScGXGaGyxT/aDIyag1+XNgU2zbHcdT3nXW4qDdL213s1M+gNvNYisNR1oHyqNKcX8niM4x15N+WQtu8GW5yJyfVq0uGb3kWcJjw== 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=Egjsld3xhZlFgQNDIf1tAX4rBoSa5ernq4FLQw9iJZg=; b=U1l3kh9fd1jSV2xNr/io5blvdxKJgfnHf6znhQr6eMLOsleI9ljDEg/SK1x43NSLwXRiZupjqQMIV4BUOv64eiU+EO7Ml28WZyvdC/SvRolGFUngyKWmUgu9LegmYwrbWTdEweTEv6gqyuwww7KQbhh6BEjHPBE1TyAAufu8uK9GPY5/Q3pwUfXUR2vlTeV8Mh2jjZtwATSCj3CSm56dB0Y6/YuutUhInaf55w6LnydvjievH5la443W4oQSAfRMhOROzc3jxcW0fjkeNZ8NBwCxqRlPCt6sDTx4/MUsrXNalzDIospV2J9F+fkOEScOW4rOnE4vwO9J982ofXWrKg== 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=Egjsld3xhZlFgQNDIf1tAX4rBoSa5ernq4FLQw9iJZg=; b=iEheXXm7ED02x69bEN2QHmN0yQNsR+kU83KiGwJ9QEYEsQaPqmi3vjTEo1a2L7WlyldzQUj9O7wj6agvxiNhnqBiJT4DZmzH+tAeG+mVM/6HNPnDMKiGOOUDu66AcmX2j4gvaNVZ8xRu0YZkXkIJzM3+Do+yDr1ViJOwUJun/d4gMbGpLxG6MYFiT2jDCbdSSTNtlUCSDmW548AQMrGkg67CIivOinC2a/VMjBEi5GU/+iogLmYuH8EvzSlmH+ljAxzUG50RzhSq2Iu6lYMrfKoq0OrD1RDpAYcO/3Au/XCfGq5KYBAgkspVKeUJ5+CNSnQN33XRTdzqya5QUoAdWw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0290.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.23; Mon, 30 Oct 2023 10:09:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde%3]) with mapi id 15.20.6907.030; Mon, 30 Oct 2023 10:09:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Oct 2023 11:10:13 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [/n8BBn51kHAHd+X7F11WZE3X+u6Bda25Cg+wNWN+bbg=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231030101013.1892470-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0290:EE_ X-MS-Office365-Filtering-Correlation-Id: bebc2b29-b539-4a44-fa55-08dbd9303c61 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m43jbSCCgOqbRugTVlBv4jWeVQ+VFnHnYTdQoi+2Sl8OtEobyh08dMco2gIhdg2HU0HsMfIZKYgO7iVbjW8d4+XkOYbITiP3Qo+hQpzmE53ACl1uDKDggPJEkK46qiDmEAR3012yN5eK4hYSb1WdM8aE2IfnjHX8ATWMZcnunv5JTKWlAT3lkfwkArxmsd+t5xUOEzVkhsL8hIHDMLGmQn+dof/pEQUiqz5TdCYU8df/F1AQdqfd2pjZFZZyM0JIK8HZnC59NsIuVxSjCPJBrbHIoORZIsI4/LLxHTeDVHTYHGoClVysVNifhUEpEMly3Jjw/giiLCq3insVn1dqgfvllRz1df8jaXZCUmD3vWMziQEEuIyyVk6WsQqJ+U9xf7dncW2A91PcPjEA+GOo6q36pPKwJb8v+ruNH4dVyFNVlyvkCl2WLw9NOsW7JM2e4CtrPp3nFTZx7Pt8ut9PD6pjUeJYK457QqTE7b+dR5lwlAQdH8XWitCP7LKQLIH4kkLkjLyQi7Ccb+rVy074L5BrCLw/M+2/DXaVM8nQTZJgHjNqJrXe9FB9L136lPuc14LSmFgmP/O4W/iPTEuaM0/OeY6pggJqW0OEc0jQgZQ+gBZqqrGm3YEF9bxyeDGi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: atUCMYTFN9uqcsluknMFEIUxR+41AJafoVWor8E+mBcb6xKycT9+aP3iXnhhrI9ts7bEtszymPeRm7bs8Fh6q7Xsigto67HLrdJqrwmwXdGIrfSirSrcpk+KoOXeirlAqAFNBs5us27Csj4cI/psA/1S9jkVIk+SiNX3bY47eqSyfjlqW1fCqNLUcDzLRhsSHXXuGoPLYEcktp1xhciYBiTZnHUsHlYmUPbDfabtUk/1aZn//sgg/OPjFRAKOtvsDhtoCVixoAdXsZzfGAhXVfig5St3JgmnR6EzUCgjgTe0b1Cmq0gC4B23jeznayu1Vo2PHpPLnlMB5kYCe3ZMfrVW0J4JQsKLnPKhilVY15BHtSPlt3d13pCn0oSyYsYMH+fNcZWDJpO9PNg+totyA3KpENlv8sTpm91MfE+UJDlNwI9hB/fuTeWNGzOhLmCMr9sjnjYgRhtTwrIRvhQAhX65GezdES1D6CapeyIoKuqzEZxBjfuMtEXreEAbdG+n/OK3C7zGyu5G1g49MBvvXkpbAdMxxHdt52gZ9sWGV9+2yooC04mwX5xNz21nlZDHwLnyngxoaF/d2/3xktm+Fk9OXpSmaFja2Xjdz3lTm+krwOZ8odUTOXTRSBAYxPzeS6PGgC/V9zWfJWyRWtMey+nKCctc20URaw5HtvEp3G3Xh91aPslIzFFWQMnWUwwlbMZDnVvA/bxoMITR0Z8jyKkPliO3MdS473UH+Lpaijr76C6g9Kl/9NujXjJFtBA62hyJcGbtZ3+OI69BIEc8rc/Ur3ZRMqK0pE6zHaXzNQ4kriTtTDfNn35aVkn60zb98PYkxmo95T28vFtKPBAFhhNMUjVn+3U44jNfCploV7WoEEC/PSNVNFkH9ERlhFsSr2/gZkR5Osg0WcDpKRigy8X1NPkdRbll3LFc8XGPb+Xlh3s3NtxEDmmNWuradJ/GYiluFw/PblV4Sk97vn66AIwb6p/56QWNTSCKCMBeICN4mjlvG+C9mRNIzP+2nze0lv32kABLMcQkdiKF26GEBQyrBI4IkW16YYSnMMMapgnFC9yL4Anc8gdT6qkFQk6Cp/l75nTcYgpsIMyo0khNpmL/kItObZq2sSjZpvEsML3p2kb21z8qd0M0+2AUHAqBvuEP/Y53xF0ntlF/dOGM98ixoG0bN7VuzLzeT/BT/1TPvaEB9jHY1Ic75WVf5qPR3uFkXsIFgA+Px1Tf4wbzEgJqRoUSpqykEt2zgfUW6WmMd8UykCny31Kr0yiy1YNq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bebc2b29-b539-4a44-fa55-08dbd9303c61 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 10:09:00.1068 (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: PR3P250MB0290 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata 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: SQlGdka8M6NY Fixes ticket #10638 and restores the behaviour from before 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_mux_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index ab2d1d89e4..63a25a350f 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2182,11 +2182,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, if (ret < 0) return ret; - if (type_in == 'g' || type_out == 'g' || !*outspec) + if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic)) *metadata_global_manual = 1; - if (type_in == 's' || type_out == 's' || !*outspec) + if (type_in == 's' || type_out == 's' || (!*outspec && !ic)) *metadata_streams_manual = 1; - if (type_in == 'c' || type_out == 'c' || !*outspec) + if (type_in == 'c' || type_out == 'c' || (!*outspec && !ic)) *metadata_chapters_manual = 1; /* ic is NULL when just disabling automatic mappings */