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 7477A46CAF for ; Tue, 8 Aug 2023 16:39:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 062D168C7E9; Tue, 8 Aug 2023 19:39:50 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C67F68C7A1 for ; Tue, 8 Aug 2023 19:39:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSIaiWXVmPqddFm50a1B26Oq5IWmwiFADMSpy8YaUPVsAazU1hkeXLwL0oqlLgg8KQ1dvgAPQuwTjf2tyxMQsBaCA4tEZ9NuE3XaXH/1zYob/obXXxbJIFnxCQtgbe+9X8A11ITPgbmuDGsNbctkKthlVSFn5rkt95MbX9cr0ZRfyKdAGBUcVRHYZoP/R4UBYJHN4nvENXVj5BnHJj57jfoOBEhfOsXb7+cTcxB94F2OoBiOZYtx4eKbPs1QW5y8K52Za3AaN6O5lj0f68rS381RWPJ9+ghqHRMfknFYzgu5DxkOd5nLxrEvGE7kiqLmWvAqEa3lEHJzch0prs2H/A== 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=HI2HXuCM6t1b4LOmoTSkSanvRGLZJionRO2TMYtHpZc=; b=derZ4VHNB6BFLWHqm5vPYtFgG2Zma64M3ePiy7W1M3N7CB13jxDvpQLgCXWDj0pSYfnEpSl8qSYTYJhe7Wkw/VrGFFgMBgvhVyJApZOQ6U6SNZWisbW5LJj9zzcffRh+Rx1+Gmdvt86bIyirh1/tSaq1dX+PyvGLVP3qg6w1XTPRvKSKnXQ4FKO8D+rWLy9VMO0GfKsrNid55RLkpXAn02CWdJnjext6Gnq1re3LRYuniWVBFUpXNEHkDNm6hJBdFf+Pe/tALiYKS+ooUVi7muYEEnZBRsqWuuRtPLcjMkOn4+LQJZLv7tg/SNEjKEciokFG/pWJstmevL90hGdSsw== 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=HI2HXuCM6t1b4LOmoTSkSanvRGLZJionRO2TMYtHpZc=; b=tBeO9WSHBylYuymsbT7OKE+AiPuSWQqy9OYIy1wPmxzwJ7lCQDuSuLME3L1ZzDHkF1CyE62fVYuO8x/5M9yT1Qtb1/rBvG++nUA0v9yuwUAFBcwTLNlVUB3dXMAfTVnfwvkmTg7J2nfsw0NNSFuSwLtFupht3OZk96UHaP0Jrjq+x7qlm9M0xqDFVE0GaSbZ76F2Ek5iekxqcEBIBhPGeIFbdUfu/Cjra2h+eJtsVQNdy02E8nB/P8HINi3vOFsj4tgHhuyYtCF29nJTg0ideZ4XXIksnO5fsozKvISOcLL2OaL53eR3RNKRzR15Ivq7kGqOFJqAReSAkiHtWdIbbQ== 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:42 +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:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [WrWDo7G0FRVj9reLvzVKVklZ9GJCxA8LNk1KAX9QAXE=] 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-2-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: 9169adef-3d47-4dcc-8869-08db982e10ea X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2br8g8S3+P92pylTKoNEHDXTjm/MJmvAjA269aWp7R12kXHUHhyh9ndscR3tKvWpGxmH3dSvgx9W1pWSKDgbvtSsPDoks8j9AJXxs9BeqrFmx8rflgaiqsf6dJVoAlLNzHpwLfs45t93Laej/Ye/xN/gFi99kfcYbwhnIfVjy5W/iU1JVuNsnw1iRlk1SaeNQIv/5nbZ+Ufga60i7QNgvRw0ofxSUbisn/tfihwllO70Y/OHIvODMk2SrXAFUnXb8VOBFG9/LmtxWb+BirOFVdVI2KjzaBZCGnwPXPiCpEgGlj2/LlbHqW/FpV4+AU1nNXfgXv4t5s5ut/KUMuiW8yiVNZTW5+yIYfwZwl9AZ5riymP13o9FMAYc/w69QjbGBrk4t/2hKik7Z8J6YeNOLmgz3kMY6Q+0HTbF6EW8U9JcuO0OciW9VNGdw1SD+BK5cSCHDIv1L9fpH43S5OD5r02x920OE7RSsP9SD8xShJm+iaUB7m9Stzce2EgSx2yXjnevoI9t2jW8JB16XipXrisZjF465JdoTCx9R4DlqEnI06fz1Sr8MOidPer3g5OXTZg5BcsTXETMbF3suUI9xz/4xLkMbNQvRFX4qEq6JsyIG3lGlMeDCZ68Xd23VWdCzN8dWjDNIgC5b+Ai7ThanXTaVw+BVutUfa68svsvPdaiOFMH84trKMijpRVrd77FM0D40eanPOsHSO9/45n1lRoHWr6/YASAZWNaEMjqLFRU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2dYaumuWlOh8XvHAxgMZnyLo7fGInyQ57vho2ort0jaQeT5cbaxNnwa/84tzxtfAKyJoMF1xAjM2al4Q1dt3pq95jn1eWKdXhmCQubosSGTn0Z4jDpabY14/aFmupgWpgwgXxidSJOGRf8OjVAMJGitX5WOX2V1mldFnhDwGXN/CrYcJbnBG2nQ64iXYMQvtyBARnEbh0uw6NkbTA37l/N4cpBdzI1MJ0ugFeuz9rxy6EZM1INqe8OAfarjiQqif3NwNck+ECcOqKWihVR2PzlikHpRltXBoPAU39Ovg0yBY0glcdOp6QojKtPodazBRZBkIulzkGG83eolLIABT5IGnvYrRE/zeEk66rNRwdCyq39ZZJPMfBfeoewlo4+S+GxQbv2d/BxLV3nYpXBmNrpSKvIEZKGuOx8zehCGFX60KTltkpK2deI5OrwgEhWNY2EBj3DCdcj+sDRrzlVmMlz6dpg7ji//yyX8PMIjYJ+ENGRNFK+JlLVkAmSUFet7tafrDWfnTvnRaRAfHdOawKA6O/Y20wlynsh8HpOAuu8gcSk2K5F4cFrqTDrpMaBTN7bzCVxjAPpphjp70P2CAJBlj40aN4Z9kYbK1GsEik1lT/2+cH80WED2DHIxveMcw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2hyQIBfi5AAfxebwdzfgsTTkw6wAmShcjeCCq0Wr1ka0xa1yzZZ/uCaUGBDn?= =?us-ascii?Q?W/qwSo7FpFRZRtajmuRJhpAMijKAvh6CwUQ/8NCAp4KirHlGjmB+WioqlINN?= =?us-ascii?Q?6oBVXOqhS3Ye2AK8JG8kYbUak6Ls0aYiSGlQwPXVPUBPEFngCmirLw3yZqjz?= =?us-ascii?Q?W2bxrep0YgzCDOE5w02TxjzFq0TvIsvKlyBN3yCsmPBCekJ3eLBuNggq+as1?= =?us-ascii?Q?cht0CnSo3uslkWUzpPnhstohd7CtwFeOwNLuXhrSC6iFtnhIbZbb5jt7kDeA?= =?us-ascii?Q?tBrkgy3TbbgQywYpLK2cIuBM0NWXaDmyOBtFo6G6BvPGY8CKj8Gls57rRoZV?= =?us-ascii?Q?pTAFz/S+L96zKWCEeZ2q8bWdOxH8TUFtmcBHOwVgU7IoulHeJGeTD9pEdIWr?= =?us-ascii?Q?+LsKDCqRVkAE6lTZDjIh2fk8Gnby+TXZKpUXulDnGPj6lK8z3en0fO7hVudP?= =?us-ascii?Q?oKLt0n68r9GYaKIHCHXo9DCHO/+7eFkndEas3U3oznisuS7ARnm8I7R1Yjrb?= =?us-ascii?Q?mh1Yt2B0GIXScIlF43X4+Q0n9eDitB4ygiHnlexQxJfpqpwD1E1re/QVMlVA?= =?us-ascii?Q?/NBAS0UTJig7kitlr607CWH7hUb7p+ZYEmf5oZqyWvXdnS3a1sQuK1KOVmrN?= =?us-ascii?Q?/DlOovk7Mo57qe045pPt77IEbecFBYcoR52kRY4DGaP6iLJC33g56vYo+3Yt?= =?us-ascii?Q?GLSrnVbY9j72iEluluRvlUu05iP4A/aAwtVGJG4GrEL7IikgyI9JkW61oFva?= =?us-ascii?Q?1DGr/bx0LemaOG9OvlHx/Ib0cB1Xs/jDRoaztbHbIviB/y8M6xLY81B5ZjRB?= =?us-ascii?Q?86VYeU5eY+DskV8urF0hJU8z/hXbysQf1u10y2TZqIlaLLucUMQV4fefphHW?= =?us-ascii?Q?Yjb9/xJuB2Hptj2LxAfmZYy2W8gZMRys3aVzDZXrcGuj1r+4WVQwUIkYchCL?= =?us-ascii?Q?H87pdXVAMcKYyc9gDTMEXCxzVDGmhOpxuA6C4hqS5/dScQrw6FD4rOy2FnAo?= =?us-ascii?Q?iiigKJEKEt/uk3eN7cD5Kyjo5Uaf8pt5S/yAUZBvy8tBrRiGqfgCCTj8fbLW?= =?us-ascii?Q?lylTe3Ru3xcNgZOHLb0X1H8XLi/cyNIskwtVtJh0gPluURt64iR54ITYC0wH?= =?us-ascii?Q?uew742579Mn6CqeKWKyUIZ8kzzgkx5kfF48GqDU8V/0izA3bdLs5JcHC9szf?= =?us-ascii?Q?X1WtdDLKzc8T/bGmW3qbwO07LJ3I2gmjGcu4oy2/4oYZqzYv4ZJvk59EgwBh?= =?us-ascii?Q?rUURJCkBdUwffbTix7dq?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9169adef-3d47-4dcc-8869-08db982e10ea 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:42.5221 (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 07/15] avformat/matroskaenc: Remove unnecessary check 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: It is only WebVTT which is special in WebM; hypothetical future subtitle codecs in WebM will presumably use the ordinary code. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d9bc31daee..9fd4cf2f6c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1831,7 +1831,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (IS_WEBM(mkv)) { const char *codec_id; - if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) { + if (par->codec_id != AV_CODEC_ID_WEBVTT) { for (j = 0; ff_webm_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (ff_webm_codec_tags[j].id == par->codec_id) { codec_id = ff_webm_codec_tags[j].str; @@ -1839,7 +1839,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, break; } } - } else if (par->codec_id == AV_CODEC_ID_WEBVTT) { + } else { if (st->disposition & AV_DISPOSITION_CAPTIONS) { codec_id = "D_WEBVTT/CAPTIONS"; native_id = MATROSKA_TRACK_TYPE_SUBTITLE; -- 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".