[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50346] trunk/blender/source/blender/imbuf /intern/util.c: Fix for logging FFmpeg messages

[Sergey Sharybin]

Revision: 50346
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50346
Author:   nazgul
Date:     2012-09-03 12:01:00 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Fix for logging FFmpeg messages

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/util.c

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2012-09-03 11:55:30 UTC (rev 50345)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2012-09-03 12:01:00 UTC (rev 50346)
@@ -225,16 +225,6 @@
 
 static char ffmpeg_last_error[1024];
 
-void silence_log_ffmpeg(int quiet)
-{
-	if (quiet) {
-		av_log_set_level(AV_LOG_QUIET);
-	}
-	else {
-		av_log_set_level(AV_LOG_DEBUG);
-	}
-}
-
 void ffmpeg_log_callback(void *ptr, int level, const char *format, va_list arg)
 {
 	if (ELEM(level, AV_LOG_FATAL, AV_LOG_ERROR)) {
@@ -244,8 +234,10 @@
 		ffmpeg_last_error[n - 1] = '\0';
 	}
 
-	/* call default logger to print all message to console */
-	av_log_default_callback(ptr, level, format, arg);
+	if (G.debug & G_DEBUG_FFMPEG) {
+		/* call default logger to print all message to console */
+		av_log_default_callback(ptr, level, format, arg);
+	}
 }
 
 void IMB_ffmpeg_init(void)
@@ -253,13 +245,6 @@
 	av_register_all();
 	avdevice_register_all();
 
-	if ((G.debug & G_DEBUG_FFMPEG) == 0) {
-		silence_log_ffmpeg(1);
-	}
-	else {
-		silence_log_ffmpeg(0);
-	}
-
 	ffmpeg_last_error[0] = '\0';
 
 	/* set own callback which could store last error to report to UI */