Andreas Rheinhardt: > Soft Works: >> Hi, >> >> can we add the attached file (SubRip_capability_tester2.srt) to the >> fate-suite data? >> >> Compared to SubRip_capability_tester.srt, it has one line removed that would >> cause (legitimate) trailing whitespace in some ref data files. >> >> It hasn’t been an issue so far due to a bug in the encoders which didn’t >> properly >> convert ASS hard-space tags (\h) and incorrectly emitted them as “\h” text. >> After fixing this, encoders to formats which don’t have a concept of “hard >> spaces”, >> will output \h as regular spaces, and in the case of that single source line >> that I have removed in the source file, this would lead to trailing spaces >> in the >> ref files. >> >> As I don’t know how, when or whether at all this can be fixed in a way that >> it >> could work with patches transported via e-mail, this single line change seems >> to be the best quick solution to the problem. >> >> Thanks, >> softworkz >> > > I don't think that this will help. Trailing whitespace should actually > only lead to a warning when applying (depending upon core.whitespace). > > Your patch is broken: There is a line "\ N is a forced line break" in > the current ref file which ends with \r\n. This line is not marked as > changed in your patchfile, but it is part of the surrounding context of > a diff; and said line of context uses only \n and is therefore not > recognized.
I based this part on a patch (mbox) downloaded from patchwork; your original patch seems to have correct line-endings, so that you (or rather: patchwork) run into the following issue: > > And when I create a diff where the patch file has the proper context, it > still fails; I need to add the "--keep-cr" option to git am to make it > work. But then it works, whereas this option didn't help if the patch > file only has \n instead of \r\n. > > - Andreas > > PS: The intra-subtitle newlines in said files are \r\n, yet the > inter-subtitle delimiters are \n only. This inconsistency might be > considered a bug. _______________________________________________ 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".
