Merge commit 'c0fd2fb27bebd1d5ab028e6df6bca9119d269122'

[ffmpeg] / libavfilter / formats.h

diff --git a/libavfilter/formats.h b/libavfilter/formats.h
index 77981f5b36e0f565d8501b744789b247d5a523b4..870809b5a03e4b694450dbbf1b30c6298493f965 100644 (file)
--- a/libavfilter/formats.h
+++ b/libavfilter/formats.h
@@ -186,15 +186,13 @@ void ff_channel_layouts_changeref(AVFilterChannelLayouts **oldref,
 av_warn_unused_result
 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.
+ /**
+ * Set the formats list to all known channel layouts. This function behaves
+ * like ff_default_query_formats(), except it only accepts known channel
+ * layouts. It should only be used with audio filters.
  */
 av_warn_unused_result
-int ff_query_formats_all(AVFilterContext *ctx);
-
+int ff_query_formats_all_layouts(AVFilterContext *ctx);
 
 /**
  * Create a list of supported formats. This is intended for use in