[FFmpeg-devel] [PATCH v17 15/19] avfilter/textmod: Add textmod, censor and show_speaker filters

Soft Works softworkz at hotmail.com
Sun Nov 28 21:22:10 EET 2021



> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of Michael
> Niedermayer
> Sent: Sunday, November 28, 2021 8:05 PM
> To: FFmpeg development discussions and patches <ffmpeg-devel at ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v17 15/19] avfilter/textmod: Add textmod,
> censor and show_speaker filters
> 
> On Sat, Nov 27, 2021 at 07:38:09PM +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
> 
> git doesnt like this one
> 
> 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	doc/filters.texi
> .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:25551
> error: doc/filters.texi: patch does not apply
> error: patch failed: libavfilter/Makefile:551
> error: libavfilter/Makefile: patch does not apply
> error: patch failed: libavfilter/allfilters.c:541
> 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".
> 


Thanks, I'll check. I thought I had eliminated all trailing whitespace
from filters.texi.

It's weird that patchwork could apply the patch. What do you use
'patch' or 'git am'?`

Thanks,
softworkz





More information about the ffmpeg-devel mailing list