[SCM] libav/experimental: Make the avfilter debug functions and macros static to avfilter.c

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:22:47 UTC 2013


The following commit has been merged in the experimental branch:
commit eb7ccf8f3369f9e15029ce65370a114206b39fd5
Author: Diego Elio Pettenò <flameeyes at gmail.com>
Date:   Tue Jan 25 00:29:34 2011 +0000

    Make the avfilter debug functions and macros static to avfilter.c
    
    This removes ff_get_ref_perms_string, ff_dprintf_ref and ff_dprintf_link
    fro the interface of libavfilter.
    
    Signed-off-by: Mans Rullgard <mans at mansr.com>

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 456ac9c..3d8d08a 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -205,7 +205,7 @@ int avfilter_config_links(AVFilterContext *filter)
     return 0;
 }
 
-char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms)
+static char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms)
 {
     snprintf(buf, buf_size, "%s%s%s%s%s%s",
              perms & AV_PERM_READ      ? "r" : "",
@@ -217,7 +217,7 @@ char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms)
     return buf;
 }
 
-void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end)
+static void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end)
 {
     av_unused char buf[16];
     dprintf(ctx,
@@ -245,7 +245,7 @@ void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end)
     dprintf(ctx, "]%s", end ? "\n" : "");
 }
 
-void ff_dprintf_link(void *ctx, AVFilterLink *link, int end)
+static void ff_dprintf_link(void *ctx, AVFilterLink *link, int end)
 {
     if (link->type == AVMEDIA_TYPE_VIDEO) {
         dprintf(ctx,
@@ -269,6 +269,8 @@ void ff_dprintf_link(void *ctx, AVFilterLink *link, int end)
     }
 }
 
+#define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func)
+
 AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, int h)
 {
     AVFilterBufferRef *ret = NULL;
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 8f352ef..188da87 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -27,14 +27,6 @@
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
-void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end);
-
-char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms);
-
-void ff_dprintf_link(void *ctx, AVFilterLink *link, int end);
-
-#define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func)
-
 /**
  * Check for the validity of graph.
  *

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list