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

[Michael Niedermayer]

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".

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

The real ebay dictionary, page 1
"Used only once"    - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
-------------- 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/20211211/ce098648/attachment.sig>