[FFmpeg-cvslog] r20299 - in trunk/libavfilter: avfilter.h formats.c

[stefano]

Author: stefano
Date: Mon Oct 19 01:06:52 2009
New Revision: 20299

Log:
Implement avfilter_make_format_list2(), which is going to replace
avfilter_make_format_list().

See the thread:
"[PATCH] Implement avfilter_make_format_list2(enum PixelFormat pix_fmt, ...)".

Modified:
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/formats.c

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Mon Oct 19 01:00:11 2009	(r20298)
+++ trunk/libavfilter/avfilter.h	Mon Oct 19 01:06:52 2009	(r20299)
@@ -23,8 +23,8 @@
 #define AVFILTER_AVFILTER_H
 
 #define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR  0
-#define LIBAVFILTER_VERSION_MICRO  1
+#define LIBAVFILTER_VERSION_MINOR  1
+#define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
@@ -180,6 +180,14 @@ struct AVFilterFormats
 AVFilterFormats *avfilter_make_format_list(int len, ...);
 
 /**
+ * Creates a list of supported formats. This is intended for use in
+ * AVFilter->query_formats().
+ * @param pix_fmt list of pixel formats, terminated by PIX_FMT_NONE
+ * @return the format list, with no existing references
+ */
+AVFilterFormats *avfilter_make_format_list2(enum PixelFormat *pix_fmt);
+
+/**
  * Returns a list of all colorspaces supported by FFmpeg.
  */
 AVFilterFormats *avfilter_all_colorspaces(void);

Modified: trunk/libavfilter/formats.c
==============================================================================
--- trunk/libavfilter/formats.c	Mon Oct 19 01:00:11 2009	(r20298)
+++ trunk/libavfilter/formats.c	Mon Oct 19 01:06:52 2009	(r20299)
@@ -87,6 +87,22 @@ AVFilterFormats *avfilter_make_format_li
     return ret;
 }
 
+AVFilterFormats *avfilter_make_format_list2(enum PixelFormat *pix_fmt)
+{
+    AVFilterFormats *formats;
+    int count;
+
+    for (count = 0; pix_fmt[count] != PIX_FMT_NONE; count++)
+        ;
+
+    formats               = av_mallocz(sizeof(AVFilterFormats));
+    formats->formats      = av_malloc(sizeof(*formats->formats) * count);
+    formats->format_count = count;
+    memcpy(formats->formats, pix_fmt, sizeof(*formats->formats) * count);
+
+    return formats;
+}
+
 AVFilterFormats *avfilter_all_colorspaces(void)
 {
     AVFilterFormats *ret;