diff options
author | Martin Poirier <theeth@yahoo.com> | 2008-11-02 19:28:34 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2008-11-02 19:28:34 +0300 |
commit | f180702a12de6ae1ce31e5c386b27bd1f39ef96b (patch) | |
tree | 0a423acba60bfb0847c82b59196e15bcb23154e0 | |
parent | 719e30f70a2ab2de5c72e1ee5d9ccb42d3d83b8c (diff) |
Quiet ffmpeg log by default. No more ugly stream info in console.
Starting Blender with -d turns info logging back on.
-rw-r--r-- | source/blender/blenkernel/BKE_writeffmpeg.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 13 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 6 |
3 files changed, 21 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h index 02f7ba6f860..50053446294 100644 --- a/source/blender/blenkernel/BKE_writeffmpeg.h +++ b/source/blender/blenkernel/BKE_writeffmpeg.h @@ -59,6 +59,8 @@ 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 cef6f802729..642b4fd1b19 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -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 @@ 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 cd58d9e4e96..05d594019a5 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -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 @@ void do_init_ffmpeg() ffmpeg_init = 1; av_register_all(); //avdevice_register_all(); + + if ((G.f & G_DEBUG) == 0) + { + silence_log_ffmpeg(1); + } } } |