From 6cc1466c61405721f5a7491914c722a2d2b10274 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 3 Nov 2008 13:33:11 +0000
Subject: Moving silence_log_ffmpeg to imbuf (it fits better there and fixes
 the link error in blenderplayer)

---
 source/blender/blenkernel/BKE_writeffmpeg.h    |  2 --
 source/blender/blenkernel/intern/writeffmpeg.c | 13 -------------
 source/blender/imbuf/intern/util.c             | 15 ++++++++++++++-
 3 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'source')

diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h
index 50053446294..02f7ba6f860 100644
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@ -59,8 +59,6 @@ extern void start_ffmpeg(struct RenderData *rd, int rectx, int recty);
 extern void end_ffmpeg(void);
 extern void append_ffmpeg(int frame, int *pixels, int rectx, int recty);
 
-void silence_log_ffmpeg(int quiet);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 642b4fd1b19..cef6f802729 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -34,7 +34,6 @@
 #include <ffmpeg/rational.h>
 #include <ffmpeg/swscale.h>
 #include <ffmpeg/opt.h>
-#include <ffmpeg/log.h>
 
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
 #define FFMPEG_OLD_FRAME_RATE 1
@@ -105,18 +104,6 @@ static RenderData *ffmpeg_renderdata = 0;
 
 #define FFMPEG_AUTOSPLIT_SIZE 2000000000
 
-void silence_log_ffmpeg(int quiet)
-{
-	if (quiet)
-	{
-		av_log_set_level(AV_LOG_QUIET);
-	}
-	else
-	{
-		av_log_set_level(AV_LOG_INFO);
-	}
-}
-
 /* Delete a picture buffer */
 
 static void delete_picture(AVFrame* f)
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 05d594019a5..231d7254224 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -33,7 +33,6 @@
 
 #include "DNA_userdef_types.h"
 #include "BKE_global.h"
-#include "BKE_writeffmpeg.h" /* for silence_log_ffmpeg */
 
 #include "imbuf.h"
 #include "imbuf_patch.h"
@@ -66,6 +65,7 @@
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/avformat.h>
 //#include <ffmpeg/avdevice.h>
+#include <ffmpeg/log.h>
 
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
 #define FFMPEG_OLD_FRAME_RATE 1
@@ -231,6 +231,19 @@ static int isqtime (char *name) {
 #endif
 
 #ifdef WITH_FFMPEG
+
+void silence_log_ffmpeg(int quiet)
+{
+	if (quiet)
+	{
+		av_log_set_level(AV_LOG_QUIET);
+	}
+	else
+	{
+		av_log_set_level(AV_LOG_INFO);
+	}
+}
+
 extern void do_init_ffmpeg();
 void do_init_ffmpeg()
 {
-- 
cgit v1.2.3