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 3837747152 for ; Thu, 10 Aug 2023 07:47:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96EB968C832; Thu, 10 Aug 2023 10:47:14 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2106.outbound.protection.outlook.com [40.92.74.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65B7368C813 for ; Thu, 10 Aug 2023 10:47:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lXKlvvIjNjv74uu/j+5kdfdaw95XsiI6in9ZwZlrdETAA1aca6/TPtKWzKzrhIGwGJ9IYOgxxjMr+avmSBEG4m4We+1u84QKAn0rXfnAEymAeRq5DBZ9vE6AYGpi9kpboIzQB3SLQse0Sy57ZdqZF5ZdkYoI7v4MjjDHGlgd9PjL/V3cMYRWWAtGbgDVy3ffwc1lIqNUOXs5OPXaDl3ybkambLqHCMEIxr6oUiR4MY2smuB3r/W422hUz4Xdk+4vazlqGIm/XBjavBFVtI5GR0IDPPPGA/S2wHJrl0mwxkH+IUqrT/tV0sOedlCts56QToSwahRR8H0K1UYsX7BwTg== 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=be8mODryeOJXEsP+7PDXrH5zI39BVYh6MPMGIdy3dbo=; b=FZ5L1WXpkURwhphFN0cfnQkygY4n1I8Z3bQFV6LVYUdEV3vlZvmSHF85MktOK3nO0FqMv9Bn6SiKBPX0BREAxmTEaQWxwo7X52ekXc/Rzxl6J75jFLf0f7dwOJVH3EN5UT0Kyigqe0fpxbTQqbBaGpZfLOFWeShDv+damg96Q4+e9SQNgSEZUrooDzPs6lZk0XWR5zXRJ540g29rtX0BWCPjZYcbWz5HvB7Ssf5+g67aCpydl8QtTXIBlnUirzptwgfEcZXNQq4edhojUsehaZrQAIew0OkOBKSZoBa5YppVsp4qvI9+ZiebYUj8OL8+1//yz/f/AJVYjyqSIt1fJQ== 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=be8mODryeOJXEsP+7PDXrH5zI39BVYh6MPMGIdy3dbo=; b=DsljNALBuK77vNkY9tirxRiWdSGZQB8HVmINoNBekf3EK2DMYs2l4phTlOCQEP8wjNLSCDtDgnbhIvoCQaKyKE+xJf6FXVzCHqtK6HwbMH/ofuWLLR1NHflOtIIYU+ZZSo7McVeiX6E4/omvBNkwJBClshyyPMgGZHPxOC/oums4P+PRCboldNFk+Pb0B2v0NFs4J4ey4Nt4iALMOAW0hHDFAGM5bacu6uhAryFhTnQU54BK+6GBgZf7TLrzWQp+4WBZljlrkzsNptabRjW7HCi3ZGsFaH9sn5sKLw0i02+riHKCRqP0Oa/GRxCLcTiCI8UNUYgZWmjAG4MBp9D8Iw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0265.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 07:47:05 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.029; Thu, 10 Aug 2023 07:47:05 +0000 Message-ID: Date: Thu, 10 Aug 2023 09:48:18 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [btoJ0BXPiR0QdSXbL1BODYIG9kSzjQsT] X-ClientProxiedBy: ZR0P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <51109a30-6554-4fd2-b934-55bb4cd9a47e@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0265:EE_ X-MS-Office365-Filtering-Correlation-Id: 6214459e-9059-4891-ca94-08db9975fdfd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C+Tg8WcRveWuALo2ekSQhYwSeKRbgWj9PXxx08UpzaFU9hWFdCI6KhVlFGdvmaEIBjZgMMW6X+RPo+M287a2wj+dqER6FpWj96oWptEolroKlpMMBGh4moBCwrsTb4wTne3uvqIKszFP2V98C0TnFu7X9SqohDrbs0xhVvfcIYlqW9HVuUbRsXZHYAWrYm3MrHB96zSZZNU4kqheGQQCR2tMbkAQCReG+vEzgqF6YqjJypFmJdWbBYFd1Lrj5wK5w+gOyPJBEUXoTblC4VbwjjvFr3mSeLaaUOeg8otxSdMy/C7FvZ//Y9x2BygVpxcJO6XvbnyMlNQ5xLv2M8p0l2NvW3SI7Kfgx6O5hrr15ShBaGi6Q0mT4xsNebsBN75g+rw0zyEP7GdN1xQX9tF8NT+p7l3RmxuvnjYUgXylUP5pOBKNLy0oKSkdOsa6FDmlBh7otcFkSq+n09P78smJ3yIkF6beJLTm7OnifSljIDfxeNUvgdA6zZwZL4AolZyQyhOS3SAC9VBg81hxVE7CrOnzuxbEvCiTeFtpYQ6VDXb6mMs45oCABzS3370L5k0j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NGlySU5EWmRsNi9kYmxoY0RadHhtd1ZqemV0bWNWWGNsTjdncE1PUkFUcUpU?= =?utf-8?B?RmQ1bW9qNzh1NjkvUmhmVllEaWFpMm5IQWs1bW5BMGVqNWl1cmtMTSs2eXF4?= =?utf-8?B?d28vQmFPcUlpNkJMR0tWb1F4SE5sQmIyRmloU1FvTE1yZGYwZVVPZHgwK3VJ?= =?utf-8?B?NEhOTXZjRXhHS2dTLzk0U1ZtY0N4WjVMMzd4L0xEQkVZZ0NVY243d0N5WHlI?= =?utf-8?B?N0FiYmdqQktLQi9NQ1FxRTAxNWR1Mkl3eHIrbkl2TDZDbUw5VDZRVVBkdHJ5?= =?utf-8?B?Y2I1NVRBN2VnY2cwdEs3M3dyblJuazRSY3RCTXNTSHhQS0tWeVJubzVPaWI5?= =?utf-8?B?cGhhRWRiSkVzSVRCVlpvME5qVmtwZ0F6eWUvaU5hV3g1ckcvMUovK0c4c2Qw?= =?utf-8?B?K1l0UjEyU1J5cmRSOG1udU9FekNNLzl2SkkrUkVZaUx3bmN5TWRMTDk1ZlJW?= =?utf-8?B?S2EzQnBWOCs5cXQvWDZ1N3BCY2x0Mks0NWJEVlhJNk9LcDE1aHdTOVBWUEEv?= =?utf-8?B?N25ubWYzVnlZZ2pPWWVXM2pxL294dG5IYVhsdWo2VGpNZTEwcytzN3pCNXVG?= =?utf-8?B?YXhmNWRocG45dTQzakZGYytwM1FvSXZ3amRCZFFGN2hFS2h4Z0lSaGhOTVpk?= =?utf-8?B?YSt2dHVMS0x1ckpUTHNTcjNSNFJXS2lqczVYaXlhMWpyMkxndnJFQlRzY2Fk?= =?utf-8?B?d0x2OTRyc3RZZ3hjS1ExYmJtZ3J0U1dHWmM3SFhoQlNWanMvYXdLWXhWR2x3?= =?utf-8?B?ZUxhbkRxYmVDVExWUDhFYW03Ly9UaXhFMzBsbzE2b09PSS9WNXlFbjZBdjE2?= =?utf-8?B?WkU0T1Z2SUNSOXR1TDNRVStmL0tlc2RocHdzU2p2U2pIemV4dzZhSE9tTFZJ?= =?utf-8?B?dmNmU0hyMnhjUDhKK01DYWhKOUxudXFVb3dLWUVSSUlDTEsyMW9hcUZNY3Z5?= =?utf-8?B?Y1gvU2dSTk13dFdCbWQzOG5Udmx5Vk9lWlVTKzFxUGR0TmRoTy9TVzhzR05Q?= =?utf-8?B?REdTL3VMdkw3TkxGbGZsbkl2ZWNoRGhEbHpYSDNjN0FWN0IrZjRCSWMzQytp?= =?utf-8?B?d1lGdFlhYkNoZ2pmdXpGcUxiSVowQnNxb0svN1h3RXpRa3ljbzk4ekdPZjAy?= =?utf-8?B?Qk05NDVPRFpEcElUTU5zUld3dVVZM0VRWGYzaVVXajZJTDBGb0JYYnRJVDFa?= =?utf-8?B?NGpaYWh0QVNqdER1V2pWbGMvTGVSR1lTSmRsNXY3d3RHcXFtazdUWCtCU0Fx?= =?utf-8?B?eGk1MmdldlFXeDg2Qk45L054bHk0RE5uV29XMmtTZkIvckE4MWJENXNUKzBL?= =?utf-8?B?UXhRcVpLUGdvV2daQ2NxNFdJblZCc1V4L0Vuak1FejNDb0tZRVdDL1cyeTU0?= =?utf-8?B?TjFhaVc4VkV3aitCSnpiUkFMSDd5WGloS1dSM1VYdngyaVdKMW9lN01YWisy?= =?utf-8?B?WnBvT0gzem1ybjB2ZXNkRExwcGN3aThPbnUyN0RMcGd1c3J6Zm5NVEFreHhk?= =?utf-8?B?OXFEMjNvRWxieHdkait2ZjduOUtldFN5MVlDdDJvTk9rRmJFNXVCRVM4c0dW?= =?utf-8?B?QzIzYllBYk5TcXI5MXRNemNzMGtLZ0orcGZlMktBSitvQ2dEQkZ3a2U4Q2gy?= =?utf-8?B?Z0VTMU5nNWFmaDl3KzgrMDNvRmsvNWFKdVVrdXoxTmpCN3Z0K3V3VFlKU1F1?= =?utf-8?Q?byGOE3bzJiR5XCt5VZ3U?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6214459e-9059-4891-ca94-08db9975fdfd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 07:47:05.7382 (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: AS8P250MB0265 Subject: Re: [FFmpeg-devel] [PATCH 06/15] avformat/matroskaenc: Hoist check out of loop 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: > Signed-off-by: Andreas Rheinhardt > --- > libavformat/matroskaenc.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > index be70e7a6f1..d9bc31daee 100644 > --- a/libavformat/matroskaenc.c > +++ b/libavformat/matroskaenc.c > @@ -1877,9 +1877,13 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, > > // look for a codec ID string specific to mkv to use, > // if none are found, use AVI codes > - if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { > + if (par->codec_id == AV_CODEC_ID_FFV1) { > + /* FFV1 is actually supported natively in Matroska, > + * yet we use the VfW way to mux it for compatibility > + * with old demuxers. (FIXME: Are they really important?) */ > + } else if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { > for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { > - if (ff_mkv_codec_tags[j].id == par->codec_id && par->codec_id != AV_CODEC_ID_FFV1) { > + if (ff_mkv_codec_tags[j].id == par->codec_id) { > put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); > native_id = 1; > break; Will apply the rest of this patchset 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".