[FFmpeg-devel] [PATCH 4/6] fftools/cmdutils: add option syntax for loading arbitrary arguments from a file
Michael Niedermayer
michael at niedermayer.cc
Wed Jan 17 15:08:29 EET 2024
On Wed, Jan 17, 2024 at 10:22:31AM +0100, Anton Khirnov wrote:
> Aligned with analogous feature for filter options in ffmpeg CLI.
> ---
> Changelog | 2 +
> doc/fftools-common-opts.texi | 9 ++++
> fftools/cmdutils.c | 99 ++++++++++++++++++++++++++++++------
> fftools/cmdutils.h | 3 ++
> fftools/ffmpeg.h | 1 -
> fftools/ffmpeg_opt.c | 26 ----------
> 6 files changed, 97 insertions(+), 43 deletions(-)
git is unsable to apply this as well
Applying: fftools/cmdutils: add option syntax for loading arbitrary arguments from a file
error: sha1 information is lacking or useless (Changelog).
error: could not build fake ancestor
Patch failed at 0001 fftools/cmdutils: add option syntax for loading arbitrary arguments from a file
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
Does the universe only have a finite lifespan? No, its going to go on
forever, its just that you wont like living in it. -- Hiranya Peiri
-------------- 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/20240117/a518c88f/attachment.sig>
More information about the ffmpeg-devel
mailing list