Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

[casparcg] / modules / ffmpeg / audio_channel_remapper.cpp

diff --git a/modules/ffmpeg/audio_channel_remapper.cpp b/modules/ffmpeg/audio_channel_remapper.cpp
index f70f9c5581323ed9ca45777fc33840e08f3d7328..4290f481bb244df669825c5b981436e55ec49074 100644 (file)
--- a/modules/ffmpeg/audio_channel_remapper.cpp
+++ b/modules/ffmpeg/audio_channel_remapper.cpp
@@ -21,6 +21,8 @@
 
 #include "StdAfx.h"
 
+#include "ffmpeg.h"
+
 #include <core/frame/audio_channel_layout.h>
 
 #include <common/except.h>
@@ -145,6 +147,7 @@ struct audio_channel_remapper::impl
                        auto pan_filter = u8(generate_pan_filter_str(input_layout_, output_layout_, mix_config));
 
                        CASPAR_LOG(debug) << "[audio_channel_remapper] Using audio filter: " << pan_filter;
+                       auto quiet_logging = ffmpeg::temporary_enable_quiet_logging_for_thread(true);
                        filter_.reset(new ffmpeg::audio_filter(
                                        boost::rational<int>(1, 1),
                                        48000,