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 18A20409D7 for ; Wed, 2 Feb 2022 04:45:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C68368B31D; Wed, 2 Feb 2022 06:45:03 +0200 (EET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07olkn2039.outbound.protection.outlook.com [40.92.15.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F1B568B2FE for ; Wed, 2 Feb 2022 06:44:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=POhdktwikGvxTmzhGFCoapAGQSE968iqLYoA4dv392moFoE86zeFX6d67Wyd/e/ETqEUH4mONnDuw87ieQoXtefiHA6zB/vqNssKavhWaGL9k8Kx1lBuL2VkzaIlQp8ul+Q4DRz1aCghF1iNRs3N8r7fM7AE18P+YZwSItkEJyg35osTV5mYjZRVoZxbbQky/855ATZe3AR91LqYQDznn7c9CtVxm78YNYdF7I2mevJD4ZPd0Dn4QiAEwrnBUy6trzl7MmDNUyDrWhPsDC0fzXRK5nwHSCdkrfhF0puJ6BoDq3TczYsd93HyWGdCFs56sY2VrbNdMMhKs70QO4HPxw== 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=N1WloGMAnbHXcYmyTJjtMt3VjeBhSPwnhXMfQy+/zT0=; b=QN+3BbxluifupX9QCDLf4ViLFKEIXiuvZYP4L9KiKaCFPEVXmaDR6veBSXWMBZ7DE98KThGDeB6ak2QXffyzC5WERYYFEFKYM2+Eln3dGwAy70QCvYj9wuQxe/2wq4LcNj1D+TtvMbBDwcX6HqkkOCqfy9tGCRqo+q6G+RjVY1Kq0pupEaVScHa1uk53fYIafC4nhxnnsYZIAHUfKkHKCwsNRqn/AMHNf9xHNt5HnIL3+y0afCbqYl6FyrsWsYxOsDB0N+GsdM4O8Oq2uXW11Kt02oZl8H3IvXg4zh2TmfA+g+YyvU7dtjHpFpt5bEcp4KFLCsOLlbjsCYDus6/onQ== 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=N1WloGMAnbHXcYmyTJjtMt3VjeBhSPwnhXMfQy+/zT0=; b=SS4vcdqjCIu+bb4tMLCXsy09rPLcL8SAf00yI6l2Aof/XyFfBIXkJJQNOCwazJq4Lfei/dSXkuTn4jM1FGB+Hj8ZFcl3B5qsMmigs2/eGgavbWaKTxMtUm9Fnbrgt5EnWVV06fXAe4JJLkia0Y5IA6iC2ATtQ2SoqCLVx8jiC+ylmth6jWHXuXsFJUru4SOQ0qVTgMYfl4AgRnT7Eh+JyIAyyiHqDCv+AUQIxrXb3CwgEaue23sfXRc4XB9u8ZbMn5b64yrusLk5IPLie6FgiFXV9uTJG4nu4MR33A9uoZlnOZTCsK0WI3T6X8eK428SeHpKRxEMv+Xam2JeMqYmFw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by BL3P223MB0009.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:348::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 04:44:54 +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; Wed, 2 Feb 2022 04:44:54 +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/DxUAgAAiirCAAAbTAIAAAGXwgAA3OwCAAEDQIA== Date: Wed, 2 Feb 2022 04:44:54 +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: [CRdUBC9PoCXHx/6CjmJ2rPaVH8owa6ob] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e019392f-6ba2-4a46-d043-08d9e606c1d3 x-ms-traffictypediagnostic: BL3P223MB0009:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: cTeOO60PnGTSDupiGLcDH3Yrf8reSfN1wSAmq0NQa6GxfnuOtQp6SnuqBiBw2jwzKSg357viiF2zOwzhUGiiv76GvUIvcbMI3aaxM/kVMtI3P/+/EPGP9uTh4FQQnME2Lt1Zgq9GflzDnS2M5H62jjQUAA62O8r4kBklrrgSL9tLKM2IjH30iZV+cKYcJuOMx0Ye1pfg+wNG29D7DSaG8tN653KNmAO0ylzLjndZmJ2XizpAPZPAenNBZLbvNDzwedDr4TnLNtjXv5b4qVCKDlwH3LgZcMXluxjjgEBXANSltfoVkTvWFoMJDs7/08A7tWLqxvahI252ptLO81UFPdBn13wrbVQWTVDFtwad48E/5jHSCw4HbhrLgnSVdqTSwfKpeSxu//cVGkvMcohMQCQ8l6HRx8+oHcYa9bVgvZ7tqvbx26KGZjZnx6mLu9wPUQABN2IN8Xsi6kCBT1g5ucReTZv+rMwHwnuXruiNqG64Mb2jZjqGSFeQ+SsqUlb9qno5RCCtKMXSMJlnkemPwbWGG/Q1xCd5zWgZES7CBJIYlUgpdNqgJFY3dozTZlB9g6L2aCxQ7PS+brAfr7b7GQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?WHZrUStza09nbVF3d3Y5VG00cGs0dENLRUFlWC9YTjRxSWVKUDBsMlgxSXp3?= =?utf-8?B?Z2VYU2FxSUQvNnpqNHpIa0NnY2xaajU4WGlXdlZHVzZHbHh1OHNncG9JMlND?= =?utf-8?B?OVFsQXhrYkFSVFBMM3llOTdnSWJubzdWaTAzY09MSVZ1STl1cUZncG52ZGNE?= =?utf-8?B?OE1CaFl2L1VEVkdyMzIrRHlRZ2NqMHNVbjN3M0g1UklCVUZCdS9YU2FJcVd5?= =?utf-8?B?WlBLQithaHprS00yaWRpVFY0aG8xZ3h5SnRmOW9EeTlGeVlFUWVVcVVkQXIv?= =?utf-8?B?cmNGZEJTeEQ4cnZCUHV5SVArOWJUOWRLQ0pJcGxadW1zckYvRHhGRzB5Smtl?= =?utf-8?B?YW80YmhzN3hSV3U3OEV0bFVITjFQRnI0QzNmL3JjRmhMSEtLNWRkMCs3cnQx?= =?utf-8?B?Mi9vOUdQNHRRNTBDTlN4MEZFai9YeFNRLzVUS1lsM0pvNVBZaGEyMG4vRjhE?= =?utf-8?B?WjZySCtUL2xOOCtYakJtL1JIeThoQlM4NzhHaWNGT3p2SFprcG9WeWFGU2p0?= =?utf-8?B?d1B6TEdJUEpIZFVjUm15WXlMTFZaTGhYSmxSWC9RaHFmQkVYb1hsRUd1SVN2?= =?utf-8?B?bTRzZlNmd2FCT0o5bEFFZ2ttWUVDd29vZTVMMkNHOHNCc3BRWXdZTGFrd1JV?= =?utf-8?B?Y2tKK2krckttc2ovNXRldUllb1FheS9wbVUwZHBmZDFyaGI2QmF3dDVSNkRy?= =?utf-8?B?M1I1SmdPWWRYbyt4TTJVajJVNXUzcllSUSt3MkVraW5MQUFtMitMaTJlL2Nx?= =?utf-8?B?bWVVUnhCeVgvaXFDV3V3a0JmRnNSUkFiTHJMTk5RV0p0aS9nTmp4TmlEdnlL?= =?utf-8?B?WlNVQVVBUHZRM1J5UjBCc1ZhU3Y4VjZjazJURGxZdmtxeGJ4Y3U4MmNsMExu?= =?utf-8?B?UGoxejRtaUJXZSs5Rmsrd1FDWEhwRVhhaGI0Zk4wcWk4c3BNalJ0aGk5NlVq?= =?utf-8?B?YjFJTUFyUTZWUW1WUWg4R3NzUm11SG9TZnp1ZDliakE5K3NMQSt4V3ZFcHhK?= =?utf-8?B?U2pZR3k0aHZ3dkFjSTltaVF5a05PLzMvVEJUUHNYWnMzUGowTmFrWUNuUFJY?= =?utf-8?B?VEduZndDTUlJQmNBcStaUFQ2UkM2L1JFRUFEaEhaYkVHeHlCcTBDL3ZWWDdp?= =?utf-8?B?OGxlNVBOdUl4Si9NQWp6aElkVWhSbG0zMWtJWnIvVVRnYURFamhWR0JxVHIz?= =?utf-8?B?WEhZWE5qZGNrei9yQnhndW9QdjlwR3hjV3dPcFQ0bkkzTytaQ2lUTmpRUU9M?= =?utf-8?B?OS9LQlQxUnJwV3ZsUFZhMkd5d2lLVC81cXB5b004dlJrNkJnUT09?= 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: e019392f-6ba2-4a46-d043-08d9e606c1d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 04:44:54.5086 (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: BL3P223MB0009 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: Wednesday, February 2, 2022 12:26 AM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/{ass, webvttdec}: fix > handling of backslashes > > On Tue, Feb 01, 2022 at 20:41:37 +0000, Soft Works wrote: > > > On Tue, Feb 01, 2022 at 19:44:24 +0000, Soft Works wrote: > > > > > On Sun, Jan 16, 2022 at 19:16:54 +0100, Oneric wrote: > > > > > > > > > > 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. > > > > > > Thanks for your suggestion. However, a binary diff would look like this > which > > > isn't great for seeing what's going on during review: > > > > > > [...] > > > > Yes, I know, but the question is probably what's more important.. > > > > ..that it can be applied or that the text is viewable? > > It CAN be applied (as I've now written twice) and > of course I verified this with the mail received from the list. I meant that it can be applied by everybody, including Patchwork and Michael. > If you tried to send a patch with your mail client by pasting in the diff, > then yes, presumably the line-endings would indeed get mangled. I use git format-patch, just like many others and afaik it can't create base64 encoded content. BTW. BASE64 doesn't seem to be widely used here, just checked the frequent committers among the recent submissions. just quickly checked Michael, Andreas,Gyan,Marton,James,Anton,Derek - all of > [..] That's why > doc/developer.texi tells you not to do this (instead recommending > git send-email or binary (i.e. base64-encoded) attachments). Interestingly, even the author of those lines is sending patches with Content-Transfer-Encoding: 7bit :-) > Tl;dr: > Mixed line-endings in a diff are no technical issue, > provided the patch is sent correctly.^ LOL - so the majority on this ML is sending patches incorrectly? I think, marking such files as binary is a bit more practical than expecting everybody to change ones working process. Best, 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".