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

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

[Bryce Newman]

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

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 | 




[-- Attachment #1.2: 0.png --]
[-- Type: image/png, Size: 2684 bytes --]

[-- Attachment #1.3: 1.png --]
[-- Type: image/png, Size: 2260 bytes --]

[-- Attachment #1.4: 2.png --]
[-- Type: image/png, Size: 2256 bytes --]

[-- Attachment #1.5: 3.png --]
[-- Type: image/png, Size: 7110 bytes --]

[-- Attachment #1.6: 4.jpg --]
[-- Type: image/jpeg, Size: 6422 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".

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

[Andriy Gelman]

Hi,

On Wed, 02. Feb 16:02, Bryce Newman wrote:
> 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.
> 

Probably your email client corrupted the patch when you pasted it in.

Please use git send-email or attach the patch.
Patchwork needs mime types text/x-diff or text/x-patch to process attachments.

See also
https://ffmpeg.org/developer.html#Submitting-patches

As I understand you could also make a pull request to this repo:
https://github.com/ffstaging/FFmpeg
and your patch will get forwarded to the ffmpeg-devel mailing 

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