A was trying to apply this patch:
​https://patchwork.ffmpeg.org/project/ffmpeg/patch/[email protected]/
but got the error:
curl https://patchwork.ffmpeg.org/series/407/mbox/ | git am -3
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 22931 100 22931 0 0 49313 0 --:--:-- --:--:-- --:--:-- 49208
Applying: avfilter: add overlay vaapi filter
Using index info to reconstruct a base tree...
M configure
M doc/filters.texi
M libavfilter/Makefile
M libavfilter/allfilters.c
Falling back to patching base and 3-way merge...
Auto-merging libavfilter/allfilters.c
CONFLICT (content): Merge conflict in libavfilter/allfilters.c
Auto-merging libavfilter/Makefile
Auto-merging doc/filters.texi
Auto-merging configure
CONFLICT (content): Merge conflict in configure
error: Failed to merge in the changes.
Patch failed at 0001 avfilter: add overlay vaapi filter
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".
Help me please with this filter adding.
Best regards
Maximus
_______________________________________________ Libav-user mailing list [email protected] https://ffmpeg.org/mailman/listinfo/libav-user To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
