git apply ../ffmpeg-gl-transition/ffmpeg.diff error

[Trway]

In macos
i got this error
error: patch failed: libavfilter/Makefile:367
error: libavfilter/Makefile: patch does not apply
error: patch failed: libavfilter/allfilters.c:357
error: libavfilter/allfilters.c: patch does not apply
sonmeone can answer this error how to fix

[tringuyen98]

got same error

[MattCraftsCode]

@Trway @tringuyen98
You can follow this article step by step. I have verified on my own centos7.8 server(4H8G).
https://blog.csdn.net/weixin_40948587/article/details/121073081

[893428100]

+1

[Drag0nFly]

Would be extremely useful if the docs stated which FFmpeg version the patch should cleanly apply on (that .cn blog above is very messy)

[hooop]

I wanted to apply the patch manually, but should I use the ffmpeg.diff file that was installed in the ffmpeg-opengl folder, or the ffmpeg.diff file on the Git with different content ?

[huqilong]

use this version FFmpeg-n5.1.4

[btalukdar511]

Use ffmpeg release/4.4 and update the patch to the following

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index b2c254ea67..5cc4c2f1cd 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -492,6 +492,7 @@ OBJS-$(CONFIG_YAEPBLUR_FILTER) += vf_yaepblur.o
OBJS-$(CONFIG_ZMQ_FILTER) += f_zmq.o
OBJS-$(CONFIG_ZOOMPAN_FILTER) += vf_zoompan.o
OBJS-$(CONFIG_ZSCALE_FILTER) += vf_zscale.o
+OBJS-$(CONFIG_GLTRANSITION_FILTER) += vf_gltransition.o

OBJS-$(CONFIG_ALLRGB_FILTER) += vsrc_testsrc.o
OBJS-$(CONFIG_ALLYUV_FILTER) += vsrc_testsrc.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 0872c6e0f2..836bcb43cb 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -469,6 +469,7 @@ extern AVFilter ff_vf_yaepblur;
extern AVFilter ff_vf_zmq;
extern AVFilter ff_vf_zoompan;
extern AVFilter ff_vf_zscale;
+extern const AVFilter ff_vf_gltransition;

extern AVFilter ff_vsrc_allrgb;
extern AVFilter ff_vsrc_allyuv;