Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'

[ffmpeg] / libavfilter / af_join.c

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 4ca4263bce768290766c949faae3e8d631d29406..5e338f0efbd88e6a63ee90ba177d05742ffe82d1 100644 (file)
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -78,7 +78,7 @@ typedef struct JoinBufferPriv {
 #define A AV_OPT_FLAG_AUDIO_PARAM
 #define F AV_OPT_FLAG_FILTERING_PARAM
 static const AVOption join_options[] = {
-    { "inputs",         "Number of input streams.", OFFSET(inputs),             AV_OPT_TYPE_INT,    { 2 }, 1, INT_MAX,       A|F },
+    { "inputs",         "Number of input streams.", OFFSET(inputs),             AV_OPT_TYPE_INT,    { .i64 = 2 }, 1, INT_MAX,       A|F },
     { "channel_layout", "Channel layout of the "
                         "output stream.",           OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0, A|F },
     { "map",            "A comma-separated list of channels maps in the format "
@@ -494,7 +494,7 @@ AVFilter avfilter_af_join = {
     .uninit         = join_uninit,
     .query_formats  = join_query_formats,
 
-    .inputs  = (const AVFilterPad[]){{ NULL }},
+    .inputs  = NULL,
     .outputs = (const AVFilterPad[]){{ .name          = "default",
                                        .type          = AVMEDIA_TYPE_AUDIO,
                                        .config_props  = join_config_output,