Merge commit '58d13cea307e776664dae711608b358dd4b84fff'

[ffmpeg] / libavfilter / af_join.c

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index a266a248cd295eb81f72e83c7bfaef0a713e7721..3e9ccc8d7486fc475042a2f098662fbc00c472c0 100644 (file)
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -501,7 +501,7 @@ static const AVFilterPad avfilter_af_join_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_join = {
+AVFilter ff_af_join = {
     .name           = "join",
     .description    = NULL_IF_CONFIG_SMALL("Join multiple audio streams into "
                                            "multi-channel output."),