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 7EC5B4095B for ; Tue, 1 Feb 2022 19:44:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88A0368B276; Tue, 1 Feb 2022 21:44:33 +0200 (EET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2071.outbound.protection.outlook.com [40.92.40.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2804168B0B8 for ; Tue, 1 Feb 2022 21:44:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QNfWGs4jVewXoGAcVPixGuGJILU4Cuecevl43UUeUTvPQSiKpUD+v3BzEttkjeQYrHSFXWrv3wIUYdOCghskGt9+9hxGDjYIE/R8zOVKd2SIbz11VsNR7pzTq5oLo7J3zwVafB2b3auiBIdfuETbeH6KhumPYPe5Dxd5kO3/jrN+a6lTAVHrSPJfETazsG/1mgYZR3OFzASlhxWF6LAMme2AfieN8AfIUI+8kBHx8GY4UXYWBXVu1Qyl/AuUxYK/HZGOdjnGxpnzST+g1CnlvBPGHGX5tOrbRrDZlDRpeqD/X3ko969EPefkZMLrU8mYe7l1WR/z8KZ2NlrPB80JLg== 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=FCVCAQoH6H6S43vSKjO01Dokq1YGyzzc5Qi2XpM9PCc=; b=Sb0q93j5F4Dm5omXgrWu+ismn+sIl/trnVkxeUrgesZtw8Q+hUfBJIj4mtoz/J7PzHbA4+HQZxAO/OmxWSwj33/PPmm70fztNNP7/vVd0NPWzpYXDFepvn6cyaQKzAk/qcgMbi202pg9sRBFB4p/fZC4+1O/38dqghzYKxP9WPcRyvsa+QaW0eqsqA6zY7P006F8+yqwjQ3ywlNk+ou8LQhnPXuDMOtTMcBLPXa0OYD6s+N8oIeTU+34I/mchSed4LX5tBNPkIusZGEL96fLvXsBqZU2UCYgqTAwBAyDUK1GehIgTlxtSP97LWdwVqzLLHRWHMggIMmemJQ9wRG+tA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FCVCAQoH6H6S43vSKjO01Dokq1YGyzzc5Qi2XpM9PCc=; b=EovQJ8asEafE1y3ogHEnx/tDu+gZRizABkE0Ui5lINK+ng2tSjqSLFUeuev/m3E/8yWhyU4VO7sMhfi6bM/PQofcEuDNsv1e2eiCMxXgqPpCBxv8CVttrFpZcDH6jiaT3fqHNffypgiuNe3hJwIQOg3kQn0KRMNBRqOGXFgqv+3FS/bImhyDc9zFnwbD5k6j9l5vpV1xEtjjMMCIj3wDdE3EZqTkKNQ4goqaT5lphsKLihWAtUd69AnJ2VtPgRDlUjOMi7Bd5DQd6cFM9p/xzfdPCgGx2vjZhoaF+B3X0+thuEWmj/JZhEon91T1yKPHTSXbP8GKdlKy0EXaWbEtGA== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by CH0P223MB0202.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:f2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Tue, 1 Feb 2022 19:44:24 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::496c:9ebb:f23e:8e6b]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::496c:9ebb:f23e:8e6b%4]) with mapi id 15.20.4930.022; Tue, 1 Feb 2022 19:44:24 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 1/2] avcodec/{ass, webvttdec}: fix handling of backslashes Thread-Index: AQHYCwVRgXvA06Jx3E6UTvILqno24ax/DxUAgAAiirA= Date: Tue, 1 Feb 2022 19:44:24 +0000 Message-ID: References: <20220116181655.6407-1-oneric@oneric.de> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [Ix9yemZg1cHEH0VTBR7Kiy8gL7nZS/Do] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b911fefb-4fec-4c16-b0ab-08d9e5bb400a x-ms-traffictypediagnostic: CH0P223MB0202:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: i8JFiM5rovSw+uyw5GWQmtBuguiyu/pYRSJy2XtU0x9PAVirnFJGJifJhgyFLLR2jeWfTOUHVSywliVpZm6bGJDalqzZJoSwnWmGwEc0WG6DAq0BOIm3HEDXWYvETlBwDG0VjJe4728H4tj7bP6GYnODaxZp+hJiVP3UD+lWzFhs1WrLAukbffaVFFDEz4Pv4c3kot2sDFn2nD5Fxf3QEOhDm3e6In50IDn9yMyDXf7oqNr06RrwyKusAfDT+q1bMIdqoJJHm3Kmbq+VfjhGNaNdvLBXOrf7JVt/RGTYjVTTLjArNQMGso4pyiUfiN2YpsUhNPblIEYJiHdWTabBTcTbOuMzp02mWPY1tvpQDs9yWUj2mNyO/aIHwr4Ri3MjUnNO5SLzRch3H3TuZEXVhUxEW2DDQlffr/xbABDzi3wF6URocXiWVvZwoT1g6gT5a5Kd0J783SZgh3tVHEkzHPmNi96snEYKkkB6JPhHAjHDOINquBApTIeHHozjt30q7BJF22VWF+kjzhb9Ua1e20afnnhWxWB4dOsZn/bVdeLBnT/78UloS5/ptiDT8amjR31HeNH4CPaO+snXE5QuBg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?R1g3RG05VEp0Y2d3cnhVNWNTS2lsTkh0QWZVS2t3YmNPMVNBSVIrVzlkZGUx?= =?utf-8?B?L3NkNGFOWkJFRjN5aFBVbzJoOHVmZG41MXQzNHdBcVRFeTF6dldUVVJOTlR3?= =?utf-8?B?Y2pLREQvenN0cVltYlZGb3o1SkI4RXpLdWgzT3NSaHkvVHBpdUxCVlFEaVdM?= =?utf-8?B?QVRYUG16d2tuTWwrc1hwaXdSWmV1cUQrZUprbk9Jc0Y5Ym9ZUUJGSGt1Z1Nw?= =?utf-8?B?OGlBaXpvYnorR0xPS0lRVnVzcEZjc1NMSEpTaGJyaE02c0YwNzI3a2szd3N6?= =?utf-8?B?dWZXUVY1UkJKeXRNcFMzZzBaYkxGUW1oVlEvdFFMK0ZVSVBWZ2hPOXhINkVB?= =?utf-8?B?ejhBZy8wK1E0UnowQlZURmIvVk13WHdZOXg2cThCeXNlR2lCRkNVQzRLS0tV?= =?utf-8?B?em5iTXpNRzlFalNNV3QxZitzclUrb1hMUFpDejNyaHU1NWIwNzVWRmpuMkFx?= =?utf-8?B?L1lYbUNjSFBScXNDSERza3FMcUplcUpCeExkZ29ESDJ3UHVJemNVVHdqV1gz?= =?utf-8?B?bldkeVRKSTJNQzlhUzJiUFpVWWZJZ2xaOENJL3l0ZUYvcWxidkZIVFZrcU1G?= =?utf-8?B?ZmFNTTE5dkFHT3V0WEhwcWk2UW14N1czZ24yQzBuSEdZQlFuSFZ1WEd3UXl6?= =?utf-8?B?SUpOOCtRTjB2QWFlbSs0UEl1V3laekVKU0ZXVU9Bci9sb3l4WG45aEsxM0py?= =?utf-8?B?dEFqamxMSFpCdEw5c25WY3hnMmJudGp2V2luRDZJRDF1WTdmekhMNTVsYnVQ?= =?utf-8?B?YlpqaDdrRXpNaWRQWGEzNU1ua3VPWmJWOFhsN0N1ZEdRdkM3dDZ6QjMyWXhP?= =?utf-8?B?V3g0RlNEZThzZkJhbHdYVis3MTFpS05WdmFnV1B6R2lVSm5ZbEo2cXlYMmMr?= =?utf-8?B?Y1ZoWkQ0YTR4d0daWWhuWndhSnlYRTVhaFBWUXJxT1ZxQ3k5YnA3bnM1cXpU?= =?utf-8?B?MlVxTmFkRklMRnF3cHgxQndtVXNFUGxuSHFZbFdiNTltdTVwdTRsU1dnN2ZE?= =?utf-8?B?SzFTOHpXdG5yWTNEOHR0ajdyMzZHQ2xRbmY1NXpxWCtmcDJ5NE9mK25xUmhh?= =?utf-8?B?Vk1qSzJTNkFtbXkyR1RTVW1xRFdoWTdRY3hjV2oyalBFcTJIL2NmRVExUnBW?= =?utf-8?B?OGhSeHZ5c3ZHWFp6VWVYd3lnSU5JYzg5aTRZUG1Vc3lMYlh1WUpBUkJGMFRt?= =?utf-8?B?V3VQSTBLTnpyaS9WdHlkM0N0NWdvRDBkK2x6OE1DeVM5Z0NRclhUQkhWMTFE?= =?utf-8?B?OGtmU1J5c2gxTlVVRGhiVjdYbUhIaE4wbHV4NDBHa2s4eGQwZz09?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: b911fefb-4fec-4c16-b0ab-08d9e5bb400a X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Feb 2022 19:44:24.5254 (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: CH0P223MB0202 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/{ass, webvttdec}: fix handling of backslashes 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Oneric > Sent: Tuesday, February 1, 2022 6:39 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/{ass, webvttdec}: fix > handling of backslashes > > On Sun, Jan 16, 2022 at 19:16:54 +0100, Oneric wrote: > > [PATCH 1/2] avcodec/{ass, webvttdec}: fix handling of backslashes > > libavcodec/ass.c | 5 ++++- > > libavcodec/webvttdec.c | 2 +- > > 2 files changed, 5 insertions(+), 2 deletions(-) > > > [PATCH 2/2] avcodec/webvttdec: honour bidi marks > > libavcodec/webvttdec.c | 2 +- > > tests/ref/fate/sub-webvtt2 | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > ping. > > In case anyone is wondering why patchwork fails to apply the second patch, > this is probably once again because the patch updates one of FATE's ASS > reference files which use CRLF line-endings. > Locally git am applies both without a hitch for me on top of current master > (and FATE passes after applying each patch). You can add a .gitattributes file to tests/ref/fate/ which includes the line sub-webvtt2 -diff Then your local git format-patch will create a binary diff for the file. softworkz _______________________________________________ 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".