Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'

[ffmpeg] / libavfilter / vf_pullup.c

diff --git a/libavfilter/vf_pullup.c b/libavfilter/vf_pullup.c
index 4ad441f996690312b71e54ac7d4574fafe03082b..69e1e9171935cf85bc66693d61ba8c4d7d2a57ff 100644 (file)
--- a/libavfilter/vf_pullup.c
+++ b/libavfilter/vf_pullup.c
@@ -756,7 +756,7 @@ static const AVFilterPad pullup_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_vf_pullup = {
+AVFilter ff_vf_pullup = {
     .name          = "pullup",
     .description   = NULL_IF_CONFIG_SMALL("Pullup from field sequence to frames."),
     .priv_size     = sizeof(PullupContext),