On Wed, 22 Nov 2023, Logan.Lyu wrote:

I can't reproduce the error you mentioned...

I can apply patches to the ffmpeg master branch normally using 'git apply xxx.patch/.eml' or 'git am xxx.patch/.eml'.

I guess you have emails that haven't been through the complete delivery chain, while some later party might have rewritten things.

By the way, I create these patches by /'git format-patch -s -o "../" --add-header "X-Unsent: 1" --suffix .eml --to ffmpeg-devel@ffmpeg.org -6 --filename-max-length=100' /to generate .eml file.  And /'git format-patch  -4 --filename-max-length=100' /to generate .patch file as attachment to prevent encoding format problems in email files. These command should be OK, right?

That's right for generating the patch files. I guess the problem here isn't about the patch files themselves, but the email delivery of them.

Can you try these patches again? If the error still occurs, please tell me how it occurred then I will fixed it.

I also tried applying them now with "git am", and I got this:

Applying: lavc/aarch64: new optimization for 8-bit hevc_pel_bi_pixels
error: corrupt patch at line 194
Patch failed at 0001 lavc/aarch64: new optimization for 8-bit hevc_pel_bi_pixels
hint: Use 'git am --show-current-patch=diff' to see the failed patch

Thus, same issue here.

In earlier iterations, the patches have arrived correctly when you have sent them as attachments, instead of when sending them as plain inline patches with git send-email.

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

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

Reply via email to