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 D497446CB4 for ; Tue, 8 Aug 2023 16:39:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 801B268C639; Tue, 8 Aug 2023 19:39:39 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2060.outbound.protection.outlook.com [40.92.91.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7F9668C186 for ; Tue, 8 Aug 2023 19:39:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=krbLdM8qsdzlGfVmH8BW7l/f8PgonOdBJOK2I8kp6PZLYVKX6hIxqWWBAq5PXmhT3XaK18ZBEu2f2eZHKSKSwIpIyu3dELLKhcTW19JlK7Ho4QJ808zXlWXB6qaPGBz87wm8wJCPENK96HiAAOLBsOHBx0uPQWSr8c8IbdMBBTsz4jAYLwLL+PJWSe7EUkESydRO4xY9xECTkUHr1hDGsKc0siUE3JLcTPnt3DE1aIeZDDV/57OSTfGeD8sODxsAWXi7G4LHJso8YDInW3+MwbgsgPY9VMh7fRKkZn7QNY/kP0JUeeHQxcFmn+OmxTU3Hp53udqwL+lNaJoIZCL0YA== 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=coQXxYKNvWz+3iknry1jeUdRwuo4VxoW74R3rxGXwik=; b=jed+8xgEToobbzpgx52hsxveipDGmKhWUpDoUi5AqlsYORxInsmGSPktAF0m9GuyO2U1VkdLfVUoj1X0X4L4KREtOb/19J1jW0rGLWd0e4E9JvdAEGoPM5OSLEYz+djmLdJWPzvckxUxvkcOJh6/bGrSY3F/FFLKxyWAKA5Tk4PB9KrYVdVdrxOnRzDFronw/vjTOpAy3q6DtXBz9XCmySg6rZO8aZ0ZIpenTXRP4r8o5poVnf9LWMueYNd21s6S4reawCPT++7ur5Ha+DMUyph6HPrKGuuVd9tzGQTD2Bj246YUnrYMnL/SQvVw37601/hlAFOYT7EiWDliE5yKgw== 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=coQXxYKNvWz+3iknry1jeUdRwuo4VxoW74R3rxGXwik=; b=mg1LgryMx8HMpwLygxfs5EPXkPWO35EqTeOUsjbelpghURhv+env0zbFYopnrSFYCZ+uKCJBidEBfSqqurKzLyIK6QniyUzm3OBe+Zy13AFLu25wUnjdD74tQqhBv6NMp25eu6/Nme8+WSxk1o8dovuyww+3xVu+hLdTDER/Ck7EzStaOoRiEGOl+OfujF2HIrO7npGzFC4G5khHo+rqH3oaveP7qmp5d3+cJKjpV0S6yRfoZquZQhUhi4FBAkFOQxdvCnkQXqLHp1RWQifEkNWyRr5bPZDTSLAHWdyJyoTA/CzZrkrslAgKjAF8jAF721djgGzVAiuiossnhcjdOQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:32 +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.021; Tue, 8 Aug 2023 16:39:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nKgvlSsYy4xiwkMLMhBvGOWjDEez/gIByAEa2lOjCR4=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 42d1f6e8-63d4-40fb-43cb-08db982e0ac5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2G5K2Im+ElGbxeZ8ZBglD3JGpeAvEtyEIMm8wGfRdN/GuYC9r5KlYyHtlNM0KRKh7yZvHBApuPbXhCAvrb0BcZPtBXq/I7ryxRNcLcLjZzm4K9GxJCdak8rBQzVAexUe0QcL3qFF+1t/q0sf4dPlUAQifAF9n2DyDIfMTRIrV1JVgFdSBEMd4Rt/bJl0JUih3bxwzM7K9Plr10tbHhVYOo4JTuXIo0G2D68guiV/wU3tZDPi9UMCJlfi77z/ffdcWsc+esKW24TVm1aRjM6IIHxLgdoxkiT+MT6n5PSszn6ykjRhRkvPbEPylHwvYCCkIUJXj9tZQ9asBsfbAKleo4fpCZeYa9I6jb6vfmT8sf8m4fRpU5CRnxXrPubm3Hd8AN2i0rEWVCtn+gfPDx/yNWDU9SuDpf0dWhy+SvCh7BGAUtpJuAIQQLbEgAkKI1ap+cr0i9y4aPf8kurXpB2E8SkR7TQyIOGm9dcWR2GBOqvhv3M8BO3a8+IcB0cYfHHK7rSZFLxm1/BRNQaseiqJ3YcItnH5Ti+K7dVmekdpV+eVtN7JnPVn3M6s9Yzo12RxLsRn4gbQofCuAChG4ZgQoLw11kciV05NIvb9fiH905KsTWgTobfUf2gYqrWEN2T621R9N9FoDmSDJB1hezApbow8DkiBzdF2PgFS0CfVLa/yC+Wx2nPM1tw79VGk92UY1OTLhPKwFiZmPJ894RpQNgoMkhhzYyXKnIgIZ9PbvyFY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EnlZI6jWS6VptZKaT8seCl8XoHXfjmXPMb3uOKXVymPLrSkGo8J25GTgbjmdpqoW1drEtQP8DSx/5nKV1B3FN2vVxSY0hzAu8zhQqmi6+RySTElc4oeLDSnQ/rPo4wnJAEq6BNW28MnfthtIeelGwqHFSon/1JCDjOiPVFPfMG8dELrLNtGaPb1z10d4ZfS4SIagWa//KAug6aBlGrnFJ/jJdrLPchGS/LoV3ozcdCWZFtMcUxjc5SnayIXaBLf0b7i4PGsX3s72zopXAYYw3btEHFqnW/USmg13GDADAgbKSeFrPnrjJCGR8UnxJNfM624O/7HrNk0Jkb2n1QjUg0C5WVPIA7E2V3I2FxOKBNKCd7JUfU7uvtqXb68BdaI5cljwVchAdcBNkYMNhzuVv/ei9w9EON3VF19ctkiO1DSgO/fWmyxzr1fm8v//vQhgoXjEVI6/0ZEWul5WywoFhQAOUHb0j/RRoGjwNsY0vUzVoytD10YUzy376gNyC3fP2MR0JUP2f7mh9G5+bpwe3iE+wGRFi2zacqBCsQeX+nGZ1ut728nU6aBER3chDZJ2xkSJNBWwYbOWbuIuwtXU5R/9qF4Fd8lNIw9A3N5VGcmKxJzXDYvOj42XhjkEFDGf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KfUvtDr2yTKfgBdwLFKOEiKuTIxKMr7fhkHzMPQjplZOJnuAdkFqB+E4oZRy?= =?us-ascii?Q?WTGtl0OQftXn3EfHMZ5aGowklNpardtpV0qYAG+bSZCa67p7YbUpKERzj4RK?= =?us-ascii?Q?fwXt6cMQaI/+kWxfoNAJKGdmywKN79UVtgZdJnpp7I5JI5EFgdpVYcXt3ML7?= =?us-ascii?Q?dlDJgjnvGNv2hQk+VBauixSu9YNMYaORDo2QNEz28Q+1aSG2+LGz3Ec7qsu6?= =?us-ascii?Q?4zQuQHksiXfgBUzP94wWkpTQ34xJneQpvSjdebUkYrisC4n7fVBNwAIO9/le?= =?us-ascii?Q?Uq/J5+JPOQR/PGARp7tZLJakezgD4u4/3yBT6onTpO78o52Awd97HMYwfz3d?= =?us-ascii?Q?v28XSRkN5x6y06IZ8aRVzN5EIn34PlsIstxS7+BIWMZJzs265xmWKmvJS2Pe?= =?us-ascii?Q?ews3l14bkJZXcp/jGTXdIPQ/EcnMpNjCJRTXlu6PxHprJodfVFYw0/YAP7RU?= =?us-ascii?Q?d0LpI1Wsmb06UfyMou+ChfSOAdVAlWeYhe1GTtzprpy5k0NEKrfCU9DhqDsm?= =?us-ascii?Q?v6LOImbuMXrfJoSq8hiNDQKCTI32aIP6e+c2VKr+MP/HTc0FAVyOCBYQ131+?= =?us-ascii?Q?+k78r83XTLAc6aVe3EZEB1yutdX3Tnp45F2OLE5+eZSyrww+/WACOqOx6jmG?= =?us-ascii?Q?QlmGSW8kRBSb9xzxMPyB7+mh+ZUB8on0xS0xJQ5IAjRi9uZJGMfD+ughU9TV?= =?us-ascii?Q?Qkh5ONE0R/x9x0HNjOj5IPdbo9nD+z1CbsdKJelMYBESkx04BbuO0asmj6Xz?= =?us-ascii?Q?E4v7vOCgt3roM1hvUUlHw1lc4/Olcgtyv/TbDdP5W0ssAjHjOA1g8Vvqq9FX?= =?us-ascii?Q?SCQJl/MoxFdfrQ8PiwKdoRHDUA4MdWK0OmovgI0F4ksO9DKKHqPOzRc0yRse?= =?us-ascii?Q?DHXuEnx6Sb+7WlNXjtHFL+oepzYY/kBfHlS7m0tlTKCFyU5mB4jGHYvecl2y?= =?us-ascii?Q?P/UjagOqS7XJ3o7abZslK+n6BLUJ7DW4D9tjaQqAKDX5fYidMQyvhAsNmN3F?= =?us-ascii?Q?Jn4dhLZ2ePdu70Lz21/BQ0YQW47r6aNLvxmvFknof/gjDEMRNMw9Jv71VV28?= =?us-ascii?Q?gza7pE+Dj+aeplvYPgqtBgrHUH0M8Fm1ayvVUXLRxGSG3RgUVD7h7oxKq5nT?= =?us-ascii?Q?yo+9mJyk9LqUQk2pLPotaju8Zte9fOnQkbmiQmcakWRjBqRhWU0q2gkZWKl6?= =?us-ascii?Q?1wIx2hk0+u0Jq8HWaL9ZQxfDAYl9frx7Bl3XdtOdOtYmVW00PdlEzpztAXVr?= =?us-ascii?Q?t90Ci48QqSlwXjQbG7U2?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42d1f6e8-63d4-40fb-43cb-08db982e0ac5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:32.2755 (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: AS8P250MB0268 Subject: [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 Cc: Andreas Rheinhardt 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: 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; -- 2.34.1 _______________________________________________ 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".