Merge commit '58d13cea307e776664dae711608b358dd4b84fff'

[ffmpeg] / libavfilter / vf_alphamerge.c

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index 0e5ee22f4452d3d81d14a80540a7916463a2f8da..5f0da35eba9d894f91618184a0b256e84e58dc5b 100644 (file)
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -195,7 +195,7 @@ static const AVFilterPad alphamerge_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_vf_alphamerge = {
+AVFilter ff_vf_alphamerge = {
     .name           = "alphamerge",
     .description    = NULL_IF_CONFIG_SMALL("Copy the luma value of the second "
                       "input into the alpha channel of the first input."),