From patchwork Tue Feb 13 13:22:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46238 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp1289002pzc; Tue, 13 Feb 2024 05:21:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWUXCH9q87MAxlLsI9c55OZtY+yquBWnsft3l2+4ohmF8idYAg52+nylCODCp40DUsulfv4ldSUQp8pDSpXrDyger4+LDHFM1YikQ== X-Google-Smtp-Source: AGHT+IFjXM0NRM6WnsOUDVRI9bQZBdct0ovQ+6iq8mV3dERzdKOzLKEmdKM2fn2/A7n/OmbfRMnc X-Received: by 2002:a05:6512:3e5:b0:511:8c69:c53f with SMTP id n5-20020a05651203e500b005118c69c53fmr4104281lfq.48.1707830460038; Tue, 13 Feb 2024 05:21:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWxmYKpoCdnq1G+76ofJjEy8Paed84ecsZ0uQfUeVWM/s33d7KOvVPzELjqCRehfiEdkcnrDKMuPJulPp6JXWHkpvrqfn95Bym5jG9sAQq1hWUdCyOFfNfp28Yr+t8V79Var5hP9lKMBnTryjmcPGIAAbzcEMg0+WaU64VNRD6Y9eOXnheM95XPaAuG9ExhN7T7dQq05Os9yfbGLiGSlhHQbDFJ1CP+8riA3tabnrN90GWC7iuUv5xL97Osxu/ImYcstkLQ2mP663BQ9TGL4b5EvEJAlAiIXdksg6Fx7mc7IU4wVylmGhnXMk3zlj80LNxoKrgQvDjOp/NmzJindjAhJnYtfzBylVpXHOZOKop0z11+XwWTj50UtoXHidoskmVBhNF6hAsBH3pQvHnZC2TiSDTxMy7685LfZZ7GdLkmUT9AHGgVOm4rbf32/0fbqYu2UfB3np7P+N+yk9Oac7QnrzF2xp+WBaQ1fqjlM3ZKS8af/7Q1jQmzi/cuglteq6AZYiJFlDnH9ooElLT9SMNhBvt+foD7wkYmUyKpO8179GfZ9MV3f4sAn1gOm4M5oChihlxAwQ2KbOtGvXJD7WyK3LIu6SGqbWXeA6/18oz9ycud5D9XoHXqGrAAWZ7LLpAjH4DrVlHS0MiXDZ2IN8KWTh366UpiktZD7es2wFUPAkVdrrkAPsrXUyoe+EPxfBEzmfgEENJ+ExEo0Q27QJ18pVLYPw0eHPkGxTunHLXhJszuEgr46eawxJuaRk781W6UYQGajYoMd0uybyeIMutLBQUOSjKqnC0dCBgV4/RfYdNTv9javTQcvGTVvGDGim7UgWe9rrX81QclfjcIH2eYX7ozbirpjZ0tGUIj5dBNTVEQiiRm6+TtVW0QL3Onq5utqql2j8DGLl74Sx3tOKHPUYVjKYKGgInxslo6LJM+a75min+lso7Lp0n58tP5OU9BDf rpflpGrGxtwMaE6K8i0Clb3nT/hE8FaQfDmJMgVSkfrNVKy+AgxelLROICU6pw7Q/JXfllOJi1vnfoXf1FVFojI4wQ/RvaNMaw2OsdT/xxKus/2v6PpJwwLbo1OyuTRnX1ka92m4Lqtv6EggyDY5n2YSyJUSZb2iPEeI5fX3XtuLirA5qQNPPZaBh7LYhX89aVxQdPgTHbcveMsC88yti+AwKHeiVUTk76PytHyW+fWtM3sHwmsredisCTu0GvALV4TPlYRth4JWYg+XWN/2/ok+cK9XqkXLhCfnCZyTNMQTL5CWzyt5VLfODDPLY4o5/XcnTuCui+HgkTn/MZL+MJr2anIZ8pPDwvdD7Ykt+SXziz1oSxRIRyEwt9HhUgoCRiTjCmdvNsYg//0UFocAU33YrEsaUdPRF9E3GL5muywSTmMz1nrKmhIVamdW3YAq9YXSVFwPt9RTmY1J0vDcjlMyvLZd3M4yqoBGPqS2Jwl0bHWiOcA+ltZsA5IyNLrveeWsCJLD2qBf6p/fCp1uKvReIsb9PoVrFa/FFLT7/eC0c+sAhnQqWdfakNVNirOZFtW+0KbTfz6tIV7B5GHtCQ8acHhFQ/kg1OZWThldI9QxuFbINK0TAi17SSRXc= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w9-20020a05640234c900b0056179d83fd5si3434849edc.124.2024.02.13.05.20.59; Tue, 13 Feb 2024 05:20:59 -0800 (PST) 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=tM+D8gGO; 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 2C91668D089; Tue, 13 Feb 2024 15:20:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2046.outbound.protection.outlook.com [40.92.91.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ACC068CEAB for ; Tue, 13 Feb 2024 15:20:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SyomMY859t1pRWKimcQZR9Ehp4adHLqTPeWq7Vu+BqIiCWJpMjsVOGyymMRyDHBSN9OdfMk2XGclXZ04wULMIjuGWcI4gPj5Cd6oEyHRSwwKWihCIe3MVsJZ/jxXtX9pKxSwdMLHdmWYg3wObAGfj8x2mAJ52H1izLgM6+eMDyO6o/2Sp9O4Uj7FX8oFOJu09FYsQrQ6UaGxJF+5EgC1V69WuGFQsDOzjizT+RMHXCPXynoNKoat+fU2IMj/4Xx6djsfECsd1HibfECxlfeRDvvvrktxCIsYAhiNMpNbDzsF8cDZ/BG4Qvj9F0CPY16LP60RwTnJh4b1pFCYZkWcvg== 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=D6HCfishFmtM8X2/6UpUhaATXkbDmQrjp3hgRear5ww=; b=JP5yy24/vROyX/V4ilqNl9aRO53XgZG/6GBXDYOf1gRejnLZD/8dTl8jc7KiZuvaRBJWW+wHs24+ZwDd2FGScFhkcttE6QQGoORniPOXP9GvOURKPQdrqYylWEo/8YGkDCoV9ASfJJTisvksXPa1A37VbE2fnz/RsCzwv0XYo5Uv4UzqV0BUGFYSKW2SzkkzlQnB2eycFyD9UgCANv0e8DM5Swr4v/YRfTTRUyNCzl7Sv82Y779Jx+TblCuaMakdDQHKinaaPYLP32m9kZ002iWw7IgLvMnf9yL2TmIjeqpYd/JgaFum1r18t3xo137gDNQYc2Z1uEcjkvWScoGwUw== 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=D6HCfishFmtM8X2/6UpUhaATXkbDmQrjp3hgRear5ww=; b=tM+D8gGOYpy8mMEN0MlGNEqWWtBXJXfoleFK5fpm5JuA4Fb6mnHqtunp/60PiSI/lgmB3rsCjZD1yEZt6WcvbrBcyPqep+efMAeGZTnUvHo47hm01soBsrj61e67ACE4uEBI2LCfF0ECy7tb/zSmdVsDDt0yJgQdSUCEBYIDSK3PSEgeUAGkkEGNNrPM6pXAsIaVsuOmHYZC+wNKcW8x00HI0h8oKm4ycM8ff7OYAAlMZBLfkWQFEWmnU9L49sMWGT7kSuTvohAc39Pbf8wXPGyzMpIeRJOaqZKk8/HMv1vqunGrNfjL+cEs4bJavcMTQ+sLHM7SP6X12K3mvduwnQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0375.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.39; Tue, 13 Feb 2024 13:20:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.036; Tue, 13 Feb 2024 13:20:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2024 14:22:36 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [ZfUEJx6Mm83J5RB4f8Tj5YhSWgM3rVhmSp8ZIN1rZXs=] X-ClientProxiedBy: BE1P281CA0413.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:83::26) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240213132236.528825-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0375:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d01bdbb-2186-40c8-d8de-08dc2c969686 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D26TWKwFtLbwdLgSoHpZxHrYEJtWIxM3ltvHOMY9CXdjewnJ/bI88v4cpQWbpXYF4qil00i8QTJOiruXGwtuC8FNsZjLFUPj8zHrUFZRCzr+GNMpoWOaDmzUt0D6N42KlMTaxHUKs6dp5nuSXpIGzGaJ5QEWjuxazySKRIT2PBNEFyrRd81WD78KB5ExB/24Xnqf0ATak4vHTOLrBL93zVYphzk+bHJiaR4kW4yphyrzoSVBMxR7085mM2YqY+naNFDchXkwkCi0vtxhD0SBf3HUO0K6N+ByEDcEG2opkPtWG5y0lgI0to6L6ZVmfg26GvEHepTYyeYcjIgnvifNrx0mJzp3jWTDETcCSJL4MT1wduHtLYdiKrwD81WwK9xqwZ6Azc5i7jBWoG6CtYBl1cx9mKj9WJtIU1l18xn97/W3LhLzEgryKwSTH6NUlxq1Fry+yILvPiNio/U0TaDbXgaCi8bat396yjkJOuQ0vXgIciRrCEdzQ4jmzHkPibgErtzctyCPPTPZEwtzNU4MzLdE3fpPs51PlhzXNfwiKzWmO0A+3vjIkohesfO4SzTEKnjR1cOTUtRsFm2fXadcQp2BirgXQLZ1JDGKJGhkSin+6EEhKk84hzQU+1rQXh7K X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1p1XAqDCimMOTrFpzWiBPsu3+DqXEzlbV/vz5vIqsenQZfmSLtqwe2kLYKa5vmVXLJAhNH6Ws/FLMANERh/+AXYOh/3NPmDKB8IkCmkO9m3oVnsqbP90XHqjXsbj7W3la7SM70OCZXBQDGR8AEAfp/JwFZxUNQKh8AkenP+Wspba9Hx3pN6GkYhDj37dimZyf4GQY2k2Cip/xYY3Xf1p/Oucnavqfrqpuqwm9EycoQ1NmRGYOjam0lIagX+X//KcVMuB/yvKMlFfvQggSRSEEQK51ZIf/i6/6tBy9A/pXfDJ0J3hshOLFrap13HKqUlGufnxub2ZQOV3+Fbp2vGom8aKSve77qrCeeA7xqxImAYfRO6v5bfelQsSFKr/pe0iKjJJAzWmGjGlm7+0ty6POKpxyrEI7kZa++W8Abl5bjKac/B8Yz8Ewz1zaBNU8c6xtmsCc3kZAKoRaQmZ/YWgn9UD9XU9At6BSsBCATZdmEMBzI/l1pNOiF0Y8ccWSrdzrnK8QmYT610tzrAaX8i4nxFJta0Q46akmkQjxPmku6BHvo7tDOYPfVPbcuV+NYT0nxrMIib6wF2WwyW/8MatyF3jIvYN0B+ooiW/XoA/pIvmadlusC3g1i1nhbfcob7F164VJV9KdAoYCQzttm24URU8ow3Z0v9scQYu2onfHcUCat03TvE4RSqVNt2D1VERukyTQdofIsV3D1NUuIbmbJjS+YejlpodTTYkG3x18o+krntzS8inK3LSbVvMT7A355jQRZiijR/W1gLmQoLn9jajpT6PWl393HG/9wyiLmTd4YJZ8XaO9Uofi4IHNGPxXQN8UoKhSCCEGIirW9rxwX0tAIVTW6+gsFcUI3abr0HsYuFZNWv8pM3eI06r/KkpZVndsJct1wW//VgeZTL9gAVl8ivvYxWY/bQoPQ3FPfq0n+UO+unul5SsE596rq1MuFE+22ufh7STJFJaH5ZSYhH+HSXPL/i5H9ehsOBJBBjX0T2L1pLCfPXF7S0NIuPoVfazPWQhBsr1Jg7Xqewk37jOx/Fk/DOO6d6HKhwX6hsWO1iQS4rt+nVSNnSPeAvdUQDOqLYQ1QNQB46B737XK+HDaqkgoZuhbAt5uWgwmkuVwKDOAyT3Pfz0iiMrgBS1k8JOR0xlt2iPDv9QvuZWLEaVs47GKLr/oPHUC7GGzeXAlZEfA9Kiy2YyPWfcOX1eK5TgulBM9FY89RXp9U//B+xQDZg/syQD5USL5zTkrta4YGPUMJ6dqbAwYEWP0jgA5ayVQs1+adDYwQlaJwk74g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d01bdbb-2186-40c8-d8de-08dc2c969686 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 13:20:46.4077 (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: AM8P250MB0375 Subject: [FFmpeg-devel] [PATCH] fate/subtitles: Ignore line endings for sub-scc 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: Khi+9y6aHQc9 Since 7bf1b9b35769b37684dd2f18a54f01d852a540c8, the test produces ordinary \n, yet this is not what the reference file used for the most time, leading to test failures. 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 cea4c810dd..90412e9ac1 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -114,6 +114,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc +fate-sub-scc: CMP = diff FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy