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 1DA80494F1 for ; Mon, 12 Feb 2024 10:22:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1669F68D169; Mon, 12 Feb 2024 12:22:53 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7DE268C954; Mon, 12 Feb 2024 12:22:41 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 41CAMee7011451-41CAMee8011451; Mon, 12 Feb 2024 12:22:40 +0200 Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144]) by mail9.parnet.fi (Postfix) with ESMTPS id 69344A4D04; Mon, 12 Feb 2024 12:22:40 +0200 (EET) Date: Mon, 12 Feb 2024 12:22:38 +0200 (EET) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: ffmpeg-devel@ffmpeg.org In-Reply-To: <20240212010139.5B289411B94@natalya.videolan.org> Message-ID: <24dfac94-3f60-5454-19c9-0fc856c76@martin.st> References: <20240212010139.5B289411B94@natalya.videolan.org> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [FFmpeg-cvslog] lavf/assenc: normalize line endings to \n 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: ffmpeg-cvslog@ffmpeg.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, 12 Feb 2024, rcombs wrote: > ffmpeg | branch: master | rcombs | Sun Jan 28 14:27:17 2024 -0800| [7bf1b9b35769b37684dd2f18a54f01d852a540c8] | committer: rcombs > > lavf/assenc: normalize line endings to \n > > Previously, we produced output with either \r\n or mixed line endings. > This was undesirable unto itself, but also made working with patches affecting > FATE output particularly challenging, especially via the mailing list. > > Everything that consumes the SSA/ASS format is line-ending-agnostic, > so \n is selected to simplify git/ML usage in FATE. > > Extra \r characters at the end of a packet are dropped. These are always > ignored by the renderer anyway. > >> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bf1b9b35769b37684dd2f18a54f01d852a540c8 > --- > > .gitattributes | 1 - > libavformat/assenc.c | 22 ++-- > tests/ref/fate/sub-aqtitle | 94 ++++++++-------- > tests/ref/fate/sub-ass-to-ass-transcode | 124 ++++++++++----------- > tests/ref/fate/sub-cc | 32 +++--- > tests/ref/fate/sub-cc-realtime | 44 ++++---- > tests/ref/fate/sub-cc-scte20 | 34 +++--- > tests/ref/fate/sub-charenc | 128 +++++++++++----------- > tests/ref/fate/sub-jacosub | 50 ++++----- > tests/ref/fate/sub-microdvd | 48 ++++----- > tests/ref/fate/sub-movtext | 34 +++--- > tests/ref/fate/sub-mpl2 | 36 +++---- > tests/ref/fate/sub-mpsub | 70 ++++++------ > tests/ref/fate/sub-mpsub-frames | 32 +++--- > tests/ref/fate/sub-pjs | 34 +++--- > tests/ref/fate/sub-realtext | 38 +++---- > tests/ref/fate/sub-sami | 46 ++++---- > tests/ref/fate/sub-sami2 | 186 ++++++++++++++++---------------- > tests/ref/fate/sub-srt | 102 +++++++++--------- > tests/ref/fate/sub-srt-badsyntax | 48 ++++----- > tests/ref/fate/sub-ssa-to-ass-remux | 168 ++++++++++++++--------------- > tests/ref/fate/sub-stl | 62 +++++------ > tests/ref/fate/sub-subviewer | 34 +++--- > tests/ref/fate/sub-subviewer1 | 48 ++++----- > tests/ref/fate/sub-vplayer | 34 +++--- > tests/ref/fate/sub-webvtt | 58 +++++----- > tests/ref/fate/sub-webvtt2 | 52 ++++----- > 27 files changed, 831 insertions(+), 828 deletions(-) > > diff --git a/.gitattributes b/.gitattributes > index 5a19b963b6..a900528e47 100644 > --- a/.gitattributes > +++ b/.gitattributes > @@ -1,2 +1 @@ > *.pnm -diff -text > -tests/ref/fate/sub-scc eol=crlf This change seems to have had a tricky effect on the tests/ref/fate/sub-scc file. Previously, when checked out, users got the file with CRLF newlines. When updating to this git commit, or past it, that file remains untouched, with CRLF still present, and the fate-sub-scc test fails. If one does "rm tests/ref/fate/sub-scc; git checkout tests/ref/fate/sub-scc", then the file does get restored with LR newlines, and the test passes. It's easy to do this change manually in the source checkout of a fate runner, but I'm not sure how easily we get all fate instances fixed that way - currently this test is failing in most of them. // Martin _______________________________________________ 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".