[FFmpeg-devel] [PATCH v23 16/21] avfilter/textmod: Add textmod, censor and show_speaker filters

Sat Dec 11 18:24:14 EET 2021

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of Michael
> Niedermayer
> Sent: Saturday, December 11, 2021 4:33 PM
> To: FFmpeg development discussions and patches <ffmpeg-devel at ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v23 16/21] avfilter/textmod: Add textmod,
> censor and show_speaker filters
> 
> On Fri, Dec 10, 2021 at 09:37:53PM +0000, Soft Works wrote:
> > - textmod {S -> S)
> >   Modify subtitle text in a number of ways
> >
> > - censor {S -> S)
> >   Censor subtitles using a word list
> >
> > - show_speaker {S -> S)
> >   Prepend speaker names from ASS subtitles to the visible text lines
> >
> > Signed-off-by: softworkz <softworkz at hotmail.com>
> > ---
> >  doc/filters.texi         | 206 ++++++++++++
> >  libavfilter/Makefile     |   5 +
> >  libavfilter/allfilters.c |   3 +
> >  libavfilter/sf_textmod.c | 697 +++++++++++++++++++++++++++++++++++++++
> >  4 files changed, 911 insertions(+)
> >  create mode 100644 libavfilter/sf_textmod.c
> 
> doesnt apply (using git am with the email, the other patches
> with lower numbers all applied with no such issues)
> 
> Applying: avfilter/textmod: Add textmod, censor and show_speaker filters
> .git/rebase-apply/patch:269: trailing whitespace.
> /*
> .git/rebase-apply/patch:270: trailing whitespace.
>  * Copyright (c) 2021 softworkz
> .git/rebase-apply/patch:271: trailing whitespace.
>  *
> .git/rebase-apply/patch:272: trailing whitespace.
>  * This file is part of FFmpeg.
> .git/rebase-apply/patch:273: trailing whitespace.
>  *
> warning: squelched 692 whitespace errors
> warning: 697 lines add whitespace errors.
> Using index info to reconstruct a base tree...
> M	libavfilter/Makefile
> M	libavfilter/allfilters.c
> .git/rebase-apply/patch:269: trailing whitespace.
> /*
> .git/rebase-apply/patch:270: trailing whitespace.
>  * Copyright (c) 2021 softworkz
> .git/rebase-apply/patch:271: trailing whitespace.
>  *
> .git/rebase-apply/patch:272: trailing whitespace.
>  * This file is part of FFmpeg.
> .git/rebase-apply/patch:273: trailing whitespace.
>  *
> error: patch failed: doc/filters.texi:25644
> error: doc/filters.texi: patch does not apply
> error: patch failed: libavfilter/Makefile:553
> error: libavfilter/Makefile: patch does not apply
> error: patch failed: libavfilter/allfilters.c:544
> error: libavfilter/allfilters.c: patch does not apply
> error: Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Patch failed at 0001 avfilter/textmod: Add textmod, censor and show_speaker
> filters
> Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> [...]
> --

Hi Michael,

I have no idea what is going on here.

When I look at those lines in the file that was generated
by git format-patch, there isn't any trailing white space.
Same is true when I look at this e-mail as I have received
it from the ML, and when downloading the M-Box from patchwork,
it hasn't any trailing whitespace either.

There are lines with a single space between hunks,
but all files generated by git format-patch have that.
I have double-checked all involved source files and none of them 
has any trailing white space anymore.

Yesterday, Andreas had pointed out the whitespace messages 
would only be warnings, but then I wouldn't know what's 
causing this, as it doesn't seem to be a line ending issue
either. Patchwork could apply it, interestingly.

I have attached the full patchset as zip. Hopefully this will
apply at least.

Thanks,
softworkz

Application: Microsoft.Office.Interop.Outlook.ApplicationClass
Class: 43
Session: System.__ComObject
Parent: System.__ComObject
Actions: System.__ComObject
Attachments: System.__ComObject
BillingInformation: 
Body: 

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of Michael
> Niedermayer
> Sent: Saturday, December 11, 2021 4:33 PM
> To: FFmpeg development discussions and patches <ffmpeg-devel at ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v23 16/21] avfilter/textmod: Add textmod,
> censor and show_speaker filters
> 
> On Fri, Dec 10, 2021 at 09:37:53PM +0000, Soft Works wrote:
> > - textmod {S -> S)
> >   Modify subtitle text in a number of ways
> >
> > - censor {S -> S)
> >   Censor subtitles using a word list
> >
> > - show_speaker {S -> S)
> >   Prepend speaker names from ASS subtitles to the visible text lines
> >
> > Signed-off-by: softworkz <softworkz at hotmail.com>
> > ---
> >  doc/filters.texi         | 206 ++++++++++++
> >  libavfilter/Makefile     |   5 +
> >  libavfilter/allfilters.c |   3 +
> >  libavfilter/sf_textmod.c | 697 +++++++++++++++++++++++++++++++++++++++
> >  4 files changed, 911 insertions(+)
> >  create mode 100644 libavfilter/sf_textmod.c
> 
> doesnt apply (using git am with the email, the other patches
> with lower numbers all applied with no such issues)
> 
> Applying: avfilter/textmod: Add textmod, censor and show_speaker filters
> .git/rebase-apply/patch:269: trailing whitespace.
> /*
> .git/rebase-apply/patch:270: trailing whitespace.
>  * Copyright (c) 2021 softworkz
> .git/rebase-apply/patch:271: trailing whitespace.
>  *
> .git/rebase-apply/patch:272: trailing whitespace.
>  * This file is part of FFmpeg.
> .git/rebase-apply/patch:273: trailing whitespace.
>  *
> warning: squelched 692 whitespace errors
> warning: 697 lines add whitespace errors.
> Using index info to reconstruct a base tree...
> M	libavfilter/Makefile
> M	libavfilter/allfilters.c
> .git/rebase-apply/patch:269: trailing whitespace.
> /*
> .git/rebase-apply/patch:270: trailing whitespace.
>  * Copyright (c) 2021 softworkz
> .git/rebase-apply/patch:271: trailing whitespace.
>  *
> .git/rebase-apply/patch:272: trailing whitespace.
>  * This file is part of FFmpeg.
> .git/rebase-apply/patch:273: trailing whitespace.
>  *
> error: patch failed: doc/filters.texi:25644
> error: doc/filters.texi: patch does not apply
> error: patch failed: libavfilter/Makefile:553
> error: libavfilter/Makefile: patch does not apply
> error: patch failed: libavfilter/allfilters.c:544
> error: libavfilter/allfilters.c: patch does not apply
> error: Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Patch failed at 0001 avfilter/textmod: Add textmod, censor and show_speaker
> filters
> Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> [...]
> --