diff options
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_writeffmpeg.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 13 |
2 files changed, 15 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) |