From: Michael Niedermayer <michael@niedermayer.cc>
Date: Thu, 21 Apr 2016 14:49:00 +0000 (+0200)
Subject: avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing
X-Git-Tag: android-x86-7.1-r1~5512
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b7c338e9a7390d5463f2ba6b240e254f8e77de0;p=android-x86%2Fexternal-ffmpeg.git

avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavfilter/split.c b/libavfilter/split.c
index c545fd6d39..6cf4ab13bc 100644
--- a/libavfilter/split.c
+++ b/libavfilter/split.c
@@ -95,7 +95,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 }
 
 #define OFFSET(x) offsetof(SplitContext, x)
-#define FLAGS AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_VIDEO_PARAM
+#define FLAGS (AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM)
 static const AVOption options[] = {
     { "outputs", "set number of outputs", OFFSET(nb_outputs), AV_OPT_TYPE_INT, { .i64 = 2 }, 1, INT_MAX, FLAGS },
     { NULL }
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c
index 1fb3442af1..a57c99d797 100644
--- a/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
@@ -140,7 +140,7 @@ static int query_formats(AVFilterContext *ctx)
 
 #define OFFSET(x) offsetof(FormatContext, x)
 static const AVOption options[] = {
-    { "pix_fmts", "A '|'-separated list of pixel formats", OFFSET(pix_fmts), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM },
+    { "pix_fmts", "A '|'-separated list of pixel formats", OFFSET(pix_fmts), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM },
     { NULL }
 };
 
diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c
index 7d2b5df233..68cee3929b 100644
--- a/libavfilter/vf_scale_npp.c
+++ b/libavfilter/vf_scale_npp.c
@@ -600,7 +600,7 @@ fail:
 }
 
 #define OFFSET(x) offsetof(NPPScaleContext, x)
-#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM)
 static const AVOption options[] = {
     { "w",      "Output video width",  OFFSET(w_expr),     AV_OPT_TYPE_STRING, { .str = "iw"   }, .flags = FLAGS },
     { "h",      "Output video height", OFFSET(h_expr),     AV_OPT_TYPE_STRING, { .str = "ih"   }, .flags = FLAGS },
diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c
index f7eb89182e..8dd5acfada 100644
--- a/libavfilter/vf_scale_vaapi.c
+++ b/libavfilter/vf_scale_vaapi.c
@@ -410,7 +410,7 @@ static av_cold void scale_vaapi_uninit(AVFilterContext *avctx)
 
 
 #define OFFSET(x) offsetof(ScaleVAAPIContext, x)
-#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM)
+#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM)
 static const AVOption scale_vaapi_options[] = {
     { "w", "Output video width",
       OFFSET(output_width),  AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS },