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

[James Almer]

On 12/14/2023 4:34 PM, Anton Khirnov wrote:
> Quoting Michael Niedermayer (2023-12-14 20:20:01)
>> 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".
> 
> Oh sorry, only saw this email after pushing the patches (didn't want to
> wait long, because they are quite simple and fix reported issues).
> 
> No idea why is it failing to apply, the branch should have been based on
> master.

You pushed four patches that also touched the CLI some hours ago, to fix 
other reported bugs. They were not in master when you sent this set 
yesterday.
My guess is that on your end a git rebase handled it without conflicts, 
but git am is in my experience a lot more nitpicky about non matches, 
hence these not applying.