[FFmpeg-devel] [PATCH 04/10] lavfi: implement ff_query_formats_all().

[Nicolas George]

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/formats.c |    8 ++++++++
 libavfilter/formats.h |    8 ++++++++
 2 files changed, 16 insertions(+)


Minor fixes according to the first review.


diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 5f8954c..a1d6017 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -531,6 +531,14 @@ int ff_default_query_formats(AVFilterContext *ctx)
     return 0;
 }
 
+int ff_query_formats_all(AVFilterContext *ctx)
+{
+    ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_AUDIO));
+    ff_set_common_channel_layouts(ctx, ff_all_channel_counts());
+    ff_set_common_samplerates(ctx, ff_all_samplerates());
+    return 0;
+}
+
 /* internal functions for parsing audio format arguments */
 
 int ff_parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ctx)
diff --git a/libavfilter/formats.h b/libavfilter/formats.h
index c6ace3a..6f2f778 100644
--- a/libavfilter/formats.h
+++ b/libavfilter/formats.h
@@ -172,6 +172,14 @@ void ff_channel_layouts_changeref(AVFilterChannelLayouts **oldref,
 
 int ff_default_query_formats(AVFilterContext *ctx);
 
+/**
+ * Set the formats list to all existing formats.
+ * This function behaves like ff_default_query_formats(), except it also
+ * accepts channel layouts with unknown disposition. It should only be used
+ * with audio filters.
+ */
+int ff_query_formats_all(AVFilterContext *ctx);
+
 
 /**
  * Create a list of supported formats. This is intended for use in
-- 
1.7.10.4