diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-03 16:01:00 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-03 16:01:00 +0400 |
commit | dde5ccb61fe6edc22bb17c8aa81454b526ccadef (patch) | |
tree | ff6c5696ec302a8fe5d7e21c09c4340be28ef886 /source/blender/imbuf/intern/util.c | |
parent | 1cb9b1ddf37fcc572622c54bd3c019cd582916b6 (diff) |
Fix for logging FFmpeg messages
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
-rw-r--r-- | source/blender/imbuf/intern/util.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index a765ac5c3b4..6d1e3c16631 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -225,16 +225,6 @@ static int isqtime(const char *name) 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 @@ void ffmpeg_log_callback(void *ptr, int level, const char *format, va_list arg) 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 @@ void IMB_ffmpeg_init(void) 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 */ |