Employ correct printf format specifiers, mostly in debug output.

[ffmpeg] / libavfilter / formats.c

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index d7d0322963057fa17f478bf65e09b548d8b58068..bb7b921552e8cd1b0c1135dc8300b714fff79505 100644 (file)
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -1,34 +1,42 @@
 /*
  * Filter layer - format negotiation
- * copyright (c) 2007 Bobby Bingham
+ * Copyright (c) 2007 Bobby Bingham
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/pixdesc.h"
 #include "avfilter.h"
 
-/** merge and update all the references */
+/**
+ * Add all refs from a to ret and destroy a.
+ */
 static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a)
 {
     int i;
+
     for(i = 0; i < a->refcount; i ++) {
         ret->refs[ret->refcount] = a->refs[i];
         *ret->refs[ret->refcount++] = ret;
     }
+
+    av_free(a->refs);
+    av_free(a->formats);
+    av_free(a);
 }
 
 AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
@@ -46,8 +54,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
             if(a->formats[i] == b->formats[j])
                 ret->formats[k++] = a->formats[i];
 
+    ret->format_count = k;
     /* check that there was at least one common format */
-    if(!(ret->format_count = k)) {
+    if(!ret->format_count) {
         av_free(ret->formats);
         av_free(ret);
         return NULL;
@@ -58,46 +67,53 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
     merge_ref(ret, a);
     merge_ref(ret, b);
 
-    av_free(a->refs);
-    av_free(a->formats);
-    av_free(a);
-
-    av_free(b->refs);
-    av_free(b->formats);
-    av_free(b);
-
     return ret;
 }
 
-AVFilterFormats *avfilter_make_format_list(int len, ...)
+AVFilterFormats *avfilter_make_format_list(const int *fmts)
 {
-    AVFilterFormats *ret;
-    int i;
-    va_list vl;
+    AVFilterFormats *formats;
+    int count;
 
-    ret = av_mallocz(sizeof(AVFilterFormats));
-    ret->formats = av_malloc(sizeof(*ret->formats) * len);
-    ret->format_count = len;
+    for (count = 0; fmts[count] != -1; count++)
+        ;
 
-    va_start(vl, len);
-    for(i = 0; i < len; i ++)
-        ret->formats[i] = va_arg(vl, int);
-    va_end(vl);
+    formats               = av_mallocz(sizeof(AVFilterFormats));
+    formats->formats      = av_malloc(sizeof(*formats->formats) * count);
+    formats->format_count = count;
+    memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);
 
-    return ret;
+    return formats;
 }
 
-AVFilterFormats *avfilter_all_colorspaces(void)
+int avfilter_add_format(AVFilterFormats **avff, int fmt)
 {
-    AVFilterFormats *ret;
-    int i;
+    int *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);
+
+    fmts = av_realloc((*avff)->formats,
+                      sizeof((*avff)->formats) * ((*avff)->format_count+1));
+    if (!fmts)
+        return AVERROR(ENOMEM);
 
-    for(i = 0; i < PIX_FMT_NB; i ++)
-        ret->formats[i] = i;
+    (*avff)->formats = fmts;
+    (*avff)->formats[(*avff)->format_count++] = fmt;
+    return 0;
+}
+
+AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
+{
+    AVFilterFormats *ret = NULL;
+    int fmt;
+    int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB    :
+                      type == AVMEDIA_TYPE_AUDIO ? AV_SAMPLE_FMT_NB : 0;
+
+    for (fmt = 0; fmt < num_formats; fmt++)
+        if ((type != AVMEDIA_TYPE_VIDEO) ||
+            (type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL)))
+            avfilter_add_format(&ret, fmt);
 
     return ret;
 }
@@ -122,7 +138,12 @@ void avfilter_formats_unref(AVFilterFormats **ref)
 {
     int idx;
 
-    if((idx = find_ref_index(ref)) >= 0)
+    if (!*ref)
+        return;
+
+    idx = find_ref_index(ref);
+
+    if(idx >= 0)
         memmove((*ref)->refs + idx, (*ref)->refs + idx+1,
             sizeof(AVFilterFormats**) * ((*ref)->refcount-idx-1));
 
@@ -137,9 +158,9 @@ void avfilter_formats_unref(AVFilterFormats **ref)
 void avfilter_formats_changeref(AVFilterFormats **oldref,
                                 AVFilterFormats **newref)
 {
-    int idx;
+    int idx = find_ref_index(oldref);
 
-    if((idx = find_ref_index(oldref)) >= 0) {
+    if(idx >= 0) {
         (*oldref)->refs[idx] = newref;
         *newref = *oldref;
         *oldref = NULL;