[FFmpeg-devel] [PATCH 1/2] avcodec/{ass, webvttdec}: fix handling of backslashes

[Soft Works]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of Oneric
> Sent: Tuesday, February 1, 2022 6:39 PM
> To: FFmpeg development discussions and patches <ffmpeg-devel at ffmpeg.org>
> 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