Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'

[ffmpeg] / libavfilter / vf_mergeplanes.c

diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c
index 3dcdd3c34e9cbe57f00d4da9ebe9b64df628c484..06a17fbded6973b7b16c822a19fb9931662526aa 100644 (file)
--- a/libavfilter/vf_mergeplanes.c
+++ b/libavfilter/vf_mergeplanes.c
@@ -299,7 +299,7 @@ static const AVFilterPad mergeplanes_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_vf_mergeplanes = {
+AVFilter ff_vf_mergeplanes = {
     .name          = "mergeplanes",
     .description   = NULL_IF_CONFIG_SMALL("Merge planes."),
     .priv_size     = sizeof(MergePlanesContext),