[FFmpeg-devel] fatal: Resolve operation not in progress, we are not resuming.

[Bryce Newman]

Hi,
I am trying to apply this patch https://patchwork.ffmpeg.org/project/ffmpeg/patch/D412C54E-2E51-4522-A8FB-32C5C6CA613C@gettyimages.com/.
I am able to `git apply` the patch locally and `make fate passes`, so I am not sure what I need to do to get this patch to not throw warnings.
I have tried what is suggested in https://patchwork.ffmpeg.org/check/53886/.

The results are…

git am --show-current-patch=diff
fatal: Resolve operation not in progress, we are not resuming.


Any help would be appreciated.
Thank you.
Bryce
    
    

Bryce Chester Newman | Principal Developer
 
p: +12069255045 | 



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0.png
Type: image/png
Size: 2684 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220202/69702ec1/attachment.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 1.png
Type: image/png
Size: 2260 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220202/69702ec1/attachment-0001.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 2.png
Type: image/png
Size: 2256 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220202/69702ec1/attachment-0002.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 3.png
Type: image/png
Size: 7110 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220202/69702ec1/attachment-0003.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 4.jpg
Type: image/jpeg
Size: 6422 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220202/69702ec1/attachment.jpg>