Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'

[ffmpeg] / libavfilter / af_astats.c

diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c
index b17d6631db4980ab0a36244b2400cca5dcfcef9a..f385d2e854e591149975a6b32949e9327e6944e1 100644 (file)
--- a/libavfilter/af_astats.c
+++ b/libavfilter/af_astats.c
@@ -57,7 +57,7 @@ typedef struct {
 
 static const AVOption astats_options[] = {
     { "length", "set the window length", OFFSET(time_constant), AV_OPT_TYPE_DOUBLE, {.dbl=.05}, .01, 10, FLAGS },
-    { "metadata", "inject metadata in the filtergraph", OFFSET(metadata), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS },
+    { "metadata", "inject metadata in the filtergraph", OFFSET(metadata), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS },
     { "reset", "recalculate stats after this many frames", OFFSET(reset_count), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS },
     { NULL }
 };
@@ -74,7 +74,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);