[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17294] trunk/blender/source/blender: Quiet ffmpeg log by default.

[Martin Poirier]

Revision: 17294
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17294
Author:   theeth
Date:     2008-11-02 17:28:34 +0100 (Sun, 02 Nov 2008)

Log Message:
-----------
Quiet ffmpeg log by default. No more ugly stream info in console.

Starting Blender with -d turns info logging back on.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/imbuf/intern/util.c

Modified: trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h	2008-11-02 15:16:17 UTC (rev 17293)
+++ trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h	2008-11-02 16:28:34 UTC (rev 17294)
@@ -59,6 +59,8 @@
 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

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2008-11-02 15:16:17 UTC (rev 17293)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2008-11-02 16:28:34 UTC (rev 17294)
@@ -34,6 +34,7 @@
 #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
@@ -104,6 +105,18 @@
 
 #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)

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2008-11-02 15:16:17 UTC (rev 17293)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2008-11-02 16:28:34 UTC (rev 17294)
@@ -33,6 +33,7 @@
 
 #include "DNA_userdef_types.h"
 #include "BKE_global.h"
+#include "BKE_writeffmpeg.h" /* for silence_log_ffmpeg */
 
 #include "imbuf.h"
 #include "imbuf_patch.h"
@@ -238,6 +239,11 @@
 		ffmpeg_init = 1;
 		av_register_all();
 		//avdevice_register_all();
+		
+		if ((G.f & G_DEBUG) == 0)
+		{
+			silence_log_ffmpeg(1);
+		}
 	}
 }