]> git.sesse.net Git - ffmpeg/commitdiff
lavfi: implement ff_all_channel_counts().
authorNicolas George <nicolas.george@normalesup.org>
Wed, 26 Dec 2012 15:46:43 +0000 (16:46 +0100)
committerNicolas George <nicolas.george@normalesup.org>
Sat, 26 Jan 2013 10:15:38 +0000 (11:15 +0100)
libavfilter/formats.c
libavfilter/formats.h

index 296e4f4b7cdfdef08e8d9c1d166d291f548a5ea5..5f8954c789e812821d52c5a4c0c04ecbdcab4ecf 100644 (file)
@@ -376,6 +376,15 @@ AVFilterChannelLayouts *ff_all_channel_layouts(void)
     return ret;
 }
 
+AVFilterChannelLayouts *ff_all_channel_counts(void)
+{
+    AVFilterChannelLayouts *ret = av_mallocz(sizeof(*ret));
+    if (!ret)
+        return NULL;
+    ret->all_layouts = ret->all_counts = 1;
+    return ret;
+}
+
 #define FORMATS_REF(f, ref)                                          \
 do {                                                                 \
     *ref = f;                                                        \
index 438267fc16bf4a251d67f56305cb1f1c11d288a3..4ef63df27a246ef2b09ae4df9bc7650964febfb5 100644 (file)
@@ -123,11 +123,17 @@ AVFilterFormats *ff_merge_samplerates(AVFilterFormats *a,
 
 /**
  * Construct an empty AVFilterChannelLayouts/AVFilterFormats struct --
- * representing any channel layout/sample rate.
+ * representing any channel layout (with known disposition)/sample rate.
  */
 AVFilterChannelLayouts *ff_all_channel_layouts(void);
 AVFilterFormats *ff_all_samplerates(void);
 
+/**
+ * Construct an AVFilterChannelLayouts coding for any channel layout, with
+ * known or unknown disposition.
+ */
+AVFilterChannelLayouts *ff_all_channel_counts(void);
+
 AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts);