Pretty embarassing bug; we shouldn't use av_strlcatf() on an uninitialized

[ffmpeg] / libavfilter / formats.c

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 8747bb6fffb34750f5d8d1803584afb77ac9a003..2a9bdb0bd0600b7001651ad8b49be709a5cfe3c7 100644 (file)
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/pixdesc.h"
 #include "avfilter.h"
 
 /**
@@ -85,17 +86,31 @@ AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts)
     return formats;
 }
 
-AVFilterFormats *avfilter_all_colorspaces(void)
+int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt)
 {
-    AVFilterFormats *ret;
-    int i;
+    enum PixelFormat *pix_fmts;
 
-    ret = av_mallocz(sizeof(AVFilterFormats));
-    ret->formats = av_malloc(sizeof(*ret->formats) * PIX_FMT_NB);
-    ret->format_count = PIX_FMT_NB;
+    if (!(*avff) && !(*avff = av_mallocz(sizeof(AVFilterFormats))))
+        return AVERROR(ENOMEM);
+
+    pix_fmts = av_realloc((*avff)->formats,
+                          sizeof((*avff)->formats) * ((*avff)->format_count+1));
+    if (!pix_fmts)
+        return AVERROR(ENOMEM);
+
+    (*avff)->formats = pix_fmts;
+    (*avff)->formats[(*avff)->format_count++] = pix_fmt;
+    return 0;
+}
+
+AVFilterFormats *avfilter_all_colorspaces(void)
+{
+    AVFilterFormats *ret = NULL;
+    enum PixelFormat pix_fmt;
 
-    for(i = 0; i < PIX_FMT_NB; i ++)
-        ret->formats[i] = i;
+    for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
+        if (!(av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_HWACCEL))
+            avfilter_add_colorspace(&ret, pix_fmt);
 
     return ret;
 }
@@ -118,7 +133,12 @@ static int find_ref_index(AVFilterFormats **ref)
 
 void avfilter_formats_unref(AVFilterFormats **ref)
 {
-    int idx = find_ref_index(ref);
+    int idx;
+
+    if (!*ref)
+        return;
+
+    idx = find_ref_index(ref);
 
     if(idx >= 0)
         memmove((*ref)->refs + idx, (*ref)->refs + idx+1,