From patchwork Wed Sep 21 15:28:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2702638pzh; Wed, 21 Sep 2022 08:28:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78D2RO75VwL5tvq+3V5z2C7Znzg8FZ6Udl+ppz9/tKpX/w8oVuOrTLdDkPurl5LOWh2gzU X-Received: by 2002:a17:906:794f:b0:781:dbee:4256 with SMTP id l15-20020a170906794f00b00781dbee4256mr5875771ejo.404.1663774137151; Wed, 21 Sep 2022 08:28:57 -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 sb9-20020a1709076d8900b0077edef76a03si2968106ejc.11.2022.09.21.08.28.56; Wed, 21 Sep 2022 08:28:57 -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=uIq+DNGu; 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 78DAC68BB2D; Wed, 21 Sep 2022 18:28:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2023.outbound.protection.outlook.com [40.92.91.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E83AA68B788 for ; Wed, 21 Sep 2022 18:28:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GtufTVSy495xEEr8Gz70HUpq2o+xpMHLfDX9VLgz2irmMRe43yt87Rp2/VY10ekEPkxFsjo8TMoZjsIyjfjqr4gcu/EvY8Gs81pDatJnccKwn2X9kX7PeplnfOxmiTxhM0w5X0iNQ9msB8B5x91tsc7h4f9+BAwBlyEvxHK5jmk5kW6qdAeGpQqpq1lL06qNKlq8oT5splQq66gSunedb/eKYhghHy/8sJsjVmqxPboUb+1c4aXfYX1tqFMhR0/QsathZxF3+Yb2adlReTy3Qf/XRWbmO8H4/RHZRDUzgxYPLKrGSJXrzdgIHqkqXsc+zvaOktKrhpyGkT9pcHWwRQ== 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=aZFc3d0TDlYcrN8EQuX290LP459eCKe7F18P7eBVNmM=; b=GOpBe4A6xnLlSuidqIIiWLmNYCEYoU9oX0TMe7rY9B0pwOKc79ZFP6VTs9LjA/TLns+o7OESdDKmCKovKMoPwdxgl5maK8+RFNHS/XuVe6wk7c976B5Ts+iPHdJ8uv7V6D7bvQEYVlQK2BwN3vWrcen7dYC1db9Fd9ihDej34qLbujRN9b8AKlc9EtHvqazA2+QiiH9ZyVaABbzzJjtw7gSD0F27Wz01R9tSjxbP3yzKFoaBo7SZxzlHy+QU1K4Nbb6SWpIgEzsuVaVL3WIJF0FeEwf1f048aFOvtzAGiiMbLMzAamkay5cBDJycCdwGb60iULt/1VLb1C/wFlUZ3w== 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=aZFc3d0TDlYcrN8EQuX290LP459eCKe7F18P7eBVNmM=; b=uIq+DNGuMhRS1sGGrpzJSOwDrxej7AH9/rcPPwxj1e7vrnZJ56ZEjd5Bc2tSlEYCMKzLbqqlgJHz8fXuDtJYF3AHUgMOq4jE0s/oQP988sv3FodD4lg6DexULaKaT5/wWR/KlR25aWvZHrgCvEyAKQURXXkY5X4qRFZsfEgWwid10AtWRSij1PeV+vGn8Io3IrZmqLUpQeK4ZX41K1fLpafvpISRQV3+KqU5+Q/kOCi/PYK6Xtt4lXBMC8rp5PaHsHz0q+PO0uStrmsNI5LpTBSWK40FYStEVip9Thv6uE0FXHPeYdYnPeLldEmqwQrrDAM+EqKspfxQOlHIChz/+w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0296.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Wed, 21 Sep 2022 15:28:45 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Wed, 21 Sep 2022 15:28:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 17:28:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [KAMCrBLVk4iXbixeCq+fDUcUvQyf+xVm] X-ClientProxiedBy: ZR0P278CA0167.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220921152843.710895-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0296:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e33ed0e-d367-42ec-6be1-08da9be5f916 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqQrtzjXigxngb68xQPXBz2OIokfTy1T6wImIsiczQDcnaT15LHO8E0jzPxoeRWo9DpnNwLkersf5JjeWoUZuT7l4/AL21qzLX8iuFSwb4RhK/XxWj4Z4hoK4i0kaaJ1YE39j37r32E8hexnClHutP7WaPSeREqY5SjGTRbmQCl8ov4aKLbWgJwTx6BaFkbbW5058EugeubSlY+ZLq+74NcVYMZkOcZg55Z5NMWGJ05WLjuUOjJMlUPQc89ynsoynOtQ3+55mJt1c4I70lcpGa2Oivb2vDJzRYZq0K+ATf/+PfzeD2PCEXlvQD+2xNh4M4RJ3rYFPeiVpYt8Z+xBjEhrvUN6jgB1E5GgSvIVlIBhubey5Atc/a8WFwK7j0FLSyS+ghO1uQs4R/DtgiieyGXL/5VXGtTv5ns693G6y/I/wkF4Ff0/uu1Izom59Sf6/Op+NXImeueNYqt7yalfjYNpvvj2sdJMeBtbIT+TSutajuycInHQR7KzfX87tZSH/EH4SlKlNnPOfl/Z8F5ArgyR3rYOyKLq1onB6vI/213h9cYi3WwXJy0Oll405W72oT9fXRf8FQT4APOJikG5IsdgA2v/ErQbnBVKwAZlUTUSJyS1LIigxwTuXPuBchlESTeR5yxRNlkOPM83owddtMZ8cgzp6wTaUk1jjf2Xtj8D+/QCtJfwAQqo1W2Sncg4ReSu3ctEVi8qB8oxHwmrd8/c4zabpDCn/oFutiwyjSyEKUg7pqQwFP/EnI+EfCId9s= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QrahpthYFXaZfHUvywlDSB0EPue7M0OhpcAFhG/QzEQAt7Y76G4QByee7VccYMpVO64/n7VtVH+mm7vrJ+0DFBLCKNGvTLjON+O3rzbAr5tCjdWFkDksteitvgmVH9Y+U8VK3fkVXUCsArcHje0oA9iulwjUqpq7NA0a+78OrcKLHxZx/dHjG5t358Qomtxm1NTwHsOau00dZFKp6D8BJ3eblitb6IuQdGmKtPT34Xa1hrxEno04t8kKYUUWJwVhRhJzXpfwJqKE7/iFib/4Y/mbbk72oYFPACn2U7CU+hwcIK7wTppO9N6vRS8ExGfTlAK3QameGRpEtWAEHoc38SFEzxWLnpizOOweqWZRsFoqn3ghJhK7Owa/zYzkDCGyTWNiiBk+soiCftVeECJnvIpICXRkJ6hG7otvG21b8MgtLvKo447iV1B4wqA4dOWVgeHY1HB+1y/5yHhnkgBJNu+QvTrb5HQ/EWzFrpNboFDyEEbD2q6KnXyIucBSxK62J8yaiLhFq9TBJ9ELBTTOkVsE2rz2w6BogAqK6KXQt1Nhd87NTE6U0kPFkYwSqQfVQvWg0djp/NWiND7ldP1F9VD3BwWzz+CwTaZhgiaNYDWLsHiAqT+9cLTJtfCy+M9eSgLcW7MDLAcIAPZ1EJFQyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uwOcsATXNrfn7We9RkrSLHPehkWchVwOpwOQKupgRqfEo6E0xhD5JNff61V6dj3xank7bB6epft5L65VHpp6o2euKXwNfznBIIuBMTedlwilaYX8q5YDQkhe5jzNzEaiQiMkcSJLQsbKWljmOfJ3j3XGhK34tegIyySMiUF1NLLA+8DUAAxfS3ZSmI5duHKZh5605+BhtuSl65T5zGpkzo/1XQvD6Gg8bFUD5ciy/FxOrejkOXplM29OAkfN8FjcPeQE2FGlx8HRsruMazbnFpvQVsWY0r3zF/03pcw4xMVESodns9iAai0/r0XVGhoy2udby/mMJzwZzLE158NB9DYm29rhzvqNazztlZeQp6/KTP/n9FiREZBjh2yzZ84ze9bKSeLPrNdSGL4UV2rbHa/AW6tV3mFwOpZ33mGi8jyXb3QXfisclAzuFPaEIeOqEuvk3Xh0h0MmZ6fH9hYYTj0d3uzB9juLuf6Ht917xf7WcVwaWWguJFYnDvcrieLqNQuAMxehp7tQqx+tk2seK7s5V0+0I8HrIrP3TtP0gaC95oFeS3u5oReSFd21LwqjBaFvW9JyALYN0nlNTSA1t4FBlbxslj2knxPTUleBLZt/0z+xq4f1D54k03zkblM0/7AgmorrAAzV6wVI68sUVYt2IdMahm/ZCfBQIB6Xb95tlRlbFpR9rIi/w7x5na1G4nBWyebMP/WzZsPc8LVHHrcNEfidnaxoYvbzHT6jNaL7Y/zXiR8Yg/Yx91wF2o5CX3Ate3pO/AciyRtoOEz259jvY5TDWKb+Zyo/Vr4BbDHKBvXgqiM6gr2W9SdTKkecgUv33H0aw6qkVFncknyHasFjXR2bo0vUhPDNENcq90FUbsQdFPKPAW25OGzFC7okBJlpiIg0MRcBAf8yOTTY5deAROsQVi8KKDsdL8s3i7ZnJMm4IyzeuAu9+Wznr/tcj6+1XjptC1H2Zf4f+0ZbOSuiftLdYyVr0TXBC9fUH44VJFmWXwBnDP0o5rzn2acjAK92swdULMn86f0dOLdC/c6k4LxazeXUEXy0V32+XK2Pdh0680wzXYUNhSf9tKJgS8/o8WuKqOoKyEJ6dMQJnZWPtAklgwyeX1ycLcN3x5hHcnIAt3kVlS97IlVf/uVkQQh91cUwtnp9N77+jhhjuOfCr3k9n4BUlLLhmhXoCvZRmRj2w1N2mYjUtzbmkcPpI/ZPsqMsJ9Vz0GmKdtvplLQ8yko7ILIonfhggGZ28pMyRbTHSOzVQKOn2+EqZKgjihDqKPyihxj4URr2pIlqccmz7SQj4Zr3sbplIXSP15cEW8R2FnqduqKBN71yGEML X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e33ed0e-d367-42ec-6be1-08da9be5f916 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 15:28:45.7501 (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: AM8P250MB0296 Subject: [FFmpeg-devel] [PATCH] fate/subtitles: Ignore line endings in sub-pgs-remux test 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: 30w/CKnq+F5C Should fix ticket #9934. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index e6684a814b..6c8ddf0d96 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -54,6 +54,7 @@ fate-sub-mpsub-frames: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capabi # timestamps of the remuxed file have been fixed up. FATE_SUBTITLES-$(call REMUX, SUP) += fate-sub-pgs-remux fate-sub-pgs-remux: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup sup "-copyts -c:s copy" "-copyts -c:s copy" +fate-sub-pgs-remux: CMP = diff FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs fate-sub-pjs: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/PJS_capability_tester.pjs