[FFmpeg-cvslog] avfilter: Move ff_get_ref_perms_string() to where it is used.
Diego Biurrun
git at videolan.org
Wed May 16 22:36:01 CEST 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue May 15 15:56:04 2012 +0200| [91791ac2edc46ff5f2ab09bbcdc58c3053f23075] | committer: Diego Biurrun
avfilter: Move ff_get_ref_perms_string() to where it is used.
This fixes a compilation failure with -DDEBUG.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91791ac2edc46ff5f2ab09bbcdc58c3053f23075
---
libavfilter/avfilter.c | 14 --------------
libavfilter/video.c | 14 ++++++++++++++
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index febc12f..231c875 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -179,20 +179,6 @@ int avfilter_config_links(AVFilterContext *filter)
return 0;
}
-#ifdef DEBUG
-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" : "",
- perms & AV_PERM_WRITE ? "w" : "",
- perms & AV_PERM_PRESERVE ? "p" : "",
- perms & AV_PERM_REUSE ? "u" : "",
- perms & AV_PERM_REUSE2 ? "U" : "",
- perms & AV_PERM_NEG_LINESIZES ? "n" : "");
- return buf;
-}
-#endif
-
void ff_dlog_link(void *ctx, AVFilterLink *link, int end)
{
if (link->type == AVMEDIA_TYPE_VIDEO) {
diff --git a/libavfilter/video.c b/libavfilter/video.c
index 26805fe..211cec9 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -21,6 +21,20 @@
#include "avfilter.h"
#include "internal.h"
+#ifdef DEBUG
+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" : "",
+ perms & AV_PERM_WRITE ? "w" : "",
+ perms & AV_PERM_PRESERVE ? "p" : "",
+ perms & AV_PERM_REUSE ? "u" : "",
+ perms & AV_PERM_REUSE2 ? "U" : "",
+ perms & AV_PERM_NEG_LINESIZES ? "n" : "");
+ return buf;
+}
+#endif
+
static void ff_dlog_ref(void *ctx, AVFilterBufferRef *ref, int end)
{
av_unused char buf[16];
More information about the ffmpeg-cvslog
mailing list