From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9BC1946A6D for ; Wed, 1 Nov 2023 11:19:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16C3668CD6A; Wed, 1 Nov 2023 13:19:52 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2095.outbound.protection.outlook.com [40.92.90.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 011E068CD67 for ; Wed, 1 Nov 2023 13:19:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lpX0/9yw0DbSWcYV6XNBhTpEHOUMY3HPTjpokB6sdLeNewXn6ndl9JaZMSzVwAKgafE/TIJHR4lTQKH/sukwjz+ISbAS5GtDmjeq97G4b6DftWo5Hpl2ywbY9vYaefS7B8wmUZEXmoNmgL8E2IvkRQ+8bkrn/v4GPowXWIuQc00WyuP2Zed6E+UnamG4nLcfnoaDLNi90rZDjiU82tQGW2Cwiur0WGe74LGFHoiB9C5vYlcbnGDb+mnNyfxg6DrODUmCUOUiZ06qCwXGcfWZ8v8ObrYwZKas4ohYYFtiVX7pmFm2+Z1Jrlgm8jt5llkLJZyEuScJtk0xoipDoSvaqg== 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=oRsj8ycQ5fZCuhcJFLHtH1EqOikBGDMNS9NltuqEMms=; b=jAuyuIhh7lBwfxICdOpNSa4/R1sarhFlhAoKeBQl8GTaO2PSQ2CfZ+RfggzW+Cnj8wki8YPOrFcrWP4T0jwDerafKBrC54XmXbg/HN6awzZ0mLKM7Iimornf85gn5+xXLfKWs3Zx3YiLBGW+jvfZsnZDK7QFVKiZOj052M943HDl6qtsIx1rzOXkKuDnkl7uhSm0IQDCYZcjSfsXQfMn1zceaRuRdQ8ABQDj8OHiHCorJuvweoFh8Hn+ylQW+sx+jcWgiV/vl4oiqPFhjXRmsYLkX6CgxGPnoWiMmFm5MqVg+oJSrVwzGhsLLaLTx2+/tbTWFh9z6hbOeWww/bAIDw== 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=oRsj8ycQ5fZCuhcJFLHtH1EqOikBGDMNS9NltuqEMms=; b=WRtc6jGErICsCEGTzV/foCnyqgB0eeKorKmkNygZYQmamxKpn73LhbOFkzxJfjaQ6umHtThKb162/xNHz6woscXyNBLXU8eYn+UosTJEWl5QM5YuXDuUaYYFLXKz0mNJLeVg/p/VIQrmWrhX4hH8Re6A6KuwXDmeFNdJ2oVo685A54iYb4XHI6jdO4ix4jcuXIET0+GaO/D7k73llO7A1xzuqxKruNilGNdoYMDnvbJmyES147nMRPd4EmmCOZwelQ3fE/XUGSdBj79cHfCyPOR7ZCNlpnhJAlXCxr3L273I5DJ9KJSUkJ8AxybZGmULqHP1oWCG3GOxzUwBzNZZwQ== Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) by AS8P250MB0087.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:372::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 11:19:43 +0000 Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768]) by GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768%3]) with mapi id 15.20.6933.029; Wed, 1 Nov 2023 11:19:43 +0000 Message-ID: Date: Wed, 1 Nov 2023 12:21:02 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [M1lu59Pnk5iCUFl/tEl9FHhnMgf0YqTouZtVcIdSacI=] X-ClientProxiedBy: FR4P281CA0118.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:bb::9) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0033:EE_|AS8P250MB0087:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ffc3696-aa5b-4f72-a414-08dbdacc7241 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9gsVuP95I+lPvfpo6iHTxl7BilzSZNS2bOmu6CErWJFyfibLkMueA2LXCRWwhD9yeVEXZQcTB1qaWr8TTUCZawbCPrbQJz2pbfnY+cLsk57LVlf14Ug2hgv9xdTI3NAXnc9Z45+b11d10Cb2XHaivr8xjulRAYe7AJd93xUG4jtQrzFmeyi3AzG9JKB8/mwgDRWygSA6AiQXYl6CqC7fqVRJ7vW2+tYGArvhn76O6/5UJG2wCJ1eIyUC8kO/XIB0oJn+zvtgwnD2SV6Ndob9hQlgv7rFJZl5xSDFSLkN3i+9EvciQGNGWuLWW3wsqHr2hg/xWaz05AUz6vjb9Ty+G9+RNx0PQxRrNZU3gLHbAZl+0a08dvMxpzc8wkrtCTZX8tsVJjefPFlx+gNe9YNejlveRwhEywOD1of1cq/jw9FF3uyyFP1P278Bq33dnyF0Z224+nYlDOI1umeKx2WFDgsbUSzJDb9y7O8yqM+/hPYpzUEjYDPDFAfbw7yNoxCN6xKo/cnBnbUqP8SFfSPOdgMZ5ExE6h5iVhWo9Vk0XK7sAxmchPRSgkgLxcwpYLWy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dzB3NlJSam1IaFlCRUNHUEtDM3ppVW9OS2NMSTNSdGdTenBjRkZvQ2JFS1Bq?= =?utf-8?B?eWI1c3ZCS1ZwNXlDNkJCbStLZjJ4WFU0bllvSUZDbDU2R3gxYTVETFBEREtS?= =?utf-8?B?bExyNUNZQm1uR2RRRnFtN2F4Yy9mblAwN2FzNmFEMWUwRTZsTXFxWUpoMm9w?= =?utf-8?B?SlY2L1JUenk1NTVpNWVrdVlUYTBaRlo0ZHZDSzJOd25LM2FBUUFTVGJpODVo?= =?utf-8?B?WVdYZVZ6Q2R5OU9ubjJpQ3FSeHFRNWpLZUc0MHp2Q2ZmY01DQmt1Y3E0VGo1?= =?utf-8?B?d3VxOUlPSkQ5OVJSeWw3K1hxYzBFbk1HYjRZcFJMQ2VUcGFUdFd5Nk5sRXBU?= =?utf-8?B?blVCd010VUlOWjBMVTlUQ0hpOXlYTDZrQmhIbE56akZyRXl6d0pQMFJLQlBG?= =?utf-8?B?YVUwcStOcGVvem1kZUdNaXY2RnVEZmc5a2dYMjZTUnFUUXJ1Qm9WSlh4RWJI?= =?utf-8?B?a0w3NUpBV1VGeXE4c09sazZidWtaK1dTNXhCaC9OM2VzM3dHSktIdkJjL0Zx?= =?utf-8?B?Q0VDNTlJV0VkUXR2WEZjTXBMdWRldy9wRUIyd2IwTUhGTzgybFc0Y0VYRDlV?= =?utf-8?B?ZnZiaFVMeVR1SEdXS2JHVThrZk45UzRHMTk2VWtySXlzZkI3UDB6Sy8xZlVT?= =?utf-8?B?cmthR2J6cmg4OVZRTUpONFhLVE1kSWs1OVhrTUxuM1VCcjJ0ZVZUUUhTQ0RL?= =?utf-8?B?RENUNS9YRjcyUmdHY0kzWHpOM29Oai80WklReWV0b3dQN1pWcE9sRGxRVVBX?= =?utf-8?B?WXdHNHVxUThJOVJKUGo3V2VleUZFcUJpZTBvb0dySVdxMDhhWDR5dm1UYWpU?= =?utf-8?B?RGR1WnJZSldYMk9SWGFoVmREUVFKQk1IL1g5TjRsdUpPakxpd0poUVovRUNU?= =?utf-8?B?QVdsRE5tUUszeXBVbWFsbjdZNytmeVVhcXVvQkJ1S1FvTkJPMDM5U3VLM0pL?= =?utf-8?B?V3lRd3F5dWFvUGE5cDd6d2JFenZ3dFhJeDZWNjVkOHpiK1k5RXNVRkJlQzdR?= =?utf-8?B?ZDdnOExWUXQ0RjJaa1JOeTJMcG9ZMnk2ZUQwb2pOaHdJRUJuMFFNODAwZ01j?= =?utf-8?B?RFFUbkd5N2tLRnljQXZ5L0p1eVRJb1RYMkVwSVUza2hXdEJEVFFKNFJodFZ4?= =?utf-8?B?dEVyLy90bWFWb0dMZnFHN2lMV1E3UGpsSU53bE5nTy9qTG5naU81M1FZeFBq?= =?utf-8?B?MG4vSUhqRGZaV1l5TmlKbzdEbDVmRzJLeFFhMEx4Uk51ampGZ2JFN0hvUmIz?= =?utf-8?B?Um43UUR1RFBwOGFVem94dGU3U0lhQ0hxY3VjYURzRHgrQ1FucERNTkxKYkl1?= =?utf-8?B?ODA1VlFXM0dyNnBCc21hRm5hN0txd0FvTnU2R2NrVVNGKy93aHJaTHo4Y1lJ?= =?utf-8?B?NE5GZm52c1pBK1lNNy9ycmpGUXh2NXRpbDJjYSthOVpTaFVTQWM2S3BYSTVk?= =?utf-8?B?TmszWTR0bUJVbWV0OWVPbUgzVEp5Ulg5SktsOExJUk83dUZHVjlSY3JDNU5C?= =?utf-8?B?d1QzZTB0MndpL1c1ZkNUdGxEcWFQMW9rd0FpNU0zWDh3ZXdKREVhQjdzdHZS?= =?utf-8?B?eXRLNFI4UzNaZ2Uzd20yWnA4Qk1FemJwcXorUmNDUStad0YxRUNrSVdLd0d6?= =?utf-8?B?bU12SmlQTlgzb09MblV4dzFqYTFxUkVOdGlTNjZxdzliVVZqY3E5ZHd6bEhp?= =?utf-8?Q?Th6xLGnHvO/I4XenWp6k?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ffc3696-aa5b-4f72-a414-08dbdacc7241 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2023 11:19:43.0939 (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: AS8P250MB0087 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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 */ Will apply tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".