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

[Michael Niedermayer]

On Mon, Nov 29, 2021 at 07:48:38PM +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 am 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...
.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:25560
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".


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Modern terrorism, a quick summary: Need oil, start war with country that
has oil, kill hundread thousand in war. Let country fall into chaos,
be surprised about raise of fundamantalists. Drop more bombs, kill more
people, be surprised about them taking revenge and drop even more bombs
and strip your own citizens of their rights and freedoms. to be continued
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20211130/6bdcae06/attachment.sig>