> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of > Oneric > Sent: Sunday, November 13, 2022 8:57 PM > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH v2 0/3] Some small ASS conversion > fixes > > This fixes colours and font selection for files converted to ASS > > v2 > == > > On Nicolas George’s request resent with plain text diff for the > updated > refernce files. There is no other change and applying the diff of v1 > yields equal results to v2. > > Those files do intentionally contain CRLF line endings, > but apart from tests/ref/fate/sub-scc they are not marked as > "diff eol=crlf" in .gitattributes, so the diff (intentionally) > contains > some CRLF lines as well. Patchwork has or at least used to have bugs > dealing with CRLF diffs. In particular it may wrongly fail to apply > the > patch (I believe this is fixed by now though) and the buttons > for downloading the diff or pasting it into the clipboard corrupt > line > endings making the diff useless. > Instead directly apply the email in your inbox or use patchwork’s > mbox > download. If your git is configured strictly, you may also need to > use > git am --keep-cr ... . (Or just apply v1)
Multiple issues were seen in this area. For the one part that is about mixed line endings, it's not a Patchwork bug and it cannot be "fixed" at all in any other way than using binary diffs. The problem lies in the fact that it's being sent by e-mail where the different line endings get lost (as the spec mandates CRLF and doesn't allow LF only). Caveats when testing: Your local generated .patch files still work and depending on your e-mail client, even the patch in your sent items folder might not work. But as soon as it's been sent via SMTP the different line ending get lost. 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-requ...@ffmpeg.org with subject "unsubscribe".
