Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'

[ffmpeg] / libavfilter / asrc_anullsrc.c

diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 008cb2a01bbaba763d52912532f4b4be922dc70e..512a23879a1cc78d2be5893a51d4712c8023a33b 100644 (file)
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -24,14 +24,17 @@
  * null audio source
  */
 
-#include "internal.h"
-#include "libavutil/audioconvert.h"
-#include "libavutil/opt.h"
+#include <inttypes.h>
+#include <stdio.h>
 
 #include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
 
+#include "libavutil/audioconvert.h"
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
+
 typedef struct {
     const AVClass *class;
     char   *channel_layout_str;
@@ -43,14 +46,15 @@ typedef struct {
 } ANullContext;
 
 #define OFFSET(x) offsetof(ANullContext, x)
+#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 
 static const AVOption anullsrc_options[]= {
-    { "channel_layout", "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0 },
-    { "cl",             "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0 },
-    { "sample_rate",    "set sample rate",    OFFSET(sample_rate_str)   , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0 },
-    { "r",              "set sample rate",    OFFSET(sample_rate_str)   , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0 },
-    { "nb_samples",     "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.dbl = 1024}, 0, INT_MAX },
-    { "n",              "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.dbl = 1024}, 0, INT_MAX },
+    { "channel_layout", "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0, FLAGS },
+    { "cl",             "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0, FLAGS },
+    { "sample_rate",    "set sample rate",    OFFSET(sample_rate_str)   , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0, FLAGS },
+    { "r",              "set sample rate",    OFFSET(sample_rate_str)   , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0, FLAGS },
+    { "nb_samples",     "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.dbl = 1024}, 0, INT_MAX, FLAGS },
+    { "n",              "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.dbl = 1024}, 0, INT_MAX, FLAGS },
     { NULL },
 };
 
@@ -129,4 +133,5 @@ AVFilter avfilter_asrc_anullsrc = {
                                             .config_props = config_props,
                                             .request_frame = request_frame, },
                                           { .name = NULL}},
+    .priv_class = &anullsrc_class,
 };