Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / avf_concat.c

diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 6b4fffa19fd2f51298ccae2e3166a3c05cded37e..208dc3f26cbe7164a5597c38e081ca83106b6ed5 100644 (file)
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -51,16 +51,19 @@ typedef struct {
 } ConcatContext;
 
 #define OFFSET(x) offsetof(ConcatContext, x)
+#define A AV_OPT_FLAG_AUDIO_PARAM
+#define F AV_OPT_FLAG_FILTERING_PARAM
+#define V AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption concat_options[] = {
     { "n", "specify the number of segments", OFFSET(nb_segments),
-      AV_OPT_TYPE_INT, { .dbl = 2 }, 2, INT_MAX },
+      AV_OPT_TYPE_INT, { .dbl = 2 }, 2, INT_MAX, V|A|F},
     { "v", "specify the number of video streams",
       OFFSET(nb_streams[AVMEDIA_TYPE_VIDEO]),
-      AV_OPT_TYPE_INT, { .dbl = 1 }, 0, INT_MAX },
+      AV_OPT_TYPE_INT, { .dbl = 1 }, 0, INT_MAX, V|F },
     { "a", "specify the number of audio streams",
       OFFSET(nb_streams[AVMEDIA_TYPE_AUDIO]),
-      AV_OPT_TYPE_INT, { .dbl = 0 }, 0, INT_MAX },
+      AV_OPT_TYPE_INT, { .dbl = 0 }, 0, INT_MAX, A|F},
     { 0 }
 };
 
@@ -378,8 +381,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
             for (str = 0; str < cat->nb_streams[type]; str++) {
                 AVFilterPad pad = {
                     .type             = type,
-                    .min_perms        = AV_PERM_READ,
-                    .rej_perms        = AV_PERM_REUSE2,
+                    .min_perms        = AV_PERM_READ | AV_PERM_PRESERVE,
                     .get_video_buffer = get_video_buffer,
                     .get_audio_buffer = get_audio_buffer,
                 };
@@ -440,4 +442,5 @@ AVFilter avfilter_avf_concat = {
     .priv_size     = sizeof(ConcatContext),
     .inputs        = (const AVFilterPad[]) { { .name = NULL } },
     .outputs       = (const AVFilterPad[]) { { .name = NULL } },
+    .priv_class    = &concat_class,
 };