Re: [FFmpeg-devel] [PATCH 03/12] fftools/ffmpeg: replace OutputStream.file_index by a pointer

[Michael Niedermayer <michael@niedermayer.cc>]

[-- Attachment #1.1: Type: text/plain, Size: 1318 bytes --]

On Wed, Dec 13, 2023 at 08:29:58PM +0100, Anton Khirnov wrote:
> Reduces the need to use the output_files global array.
> ---
>  fftools/ffmpeg.c          | 12 ++++++------
>  fftools/ffmpeg.h          |  4 +++-
>  fftools/ffmpeg_enc.c      | 21 +++++++++++----------
>  fftools/ffmpeg_filter.c   | 22 +++++++++++-----------
>  fftools/ffmpeg_mux.c      | 11 +++++------
>  fftools/ffmpeg_mux_init.c | 12 ++++++------
>  6 files changed, 42 insertions(+), 40 deletions(-)

git seems to fail to apply this

Applying: fftools/ffmpeg: replace OutputStream.file_index by a pointer
error: sha1 information is lacking or useless (fftools/ffmpeg.c).
error: could not build fake ancestor
Patch failed at 0001 fftools/ffmpeg: replace OutputStream.file_index by a pointer
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 2
"100% positive feedback" - "All either got their money back or didnt complain"
"Best seller ever, very honest" - "Seller refunded buyer after failed scam"

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".