summaryrefslogtreecommitdiff
path: root/src/lib/environment_info.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-05-07 19:13:04 +0200
committerCarl Hetherington <cth@carlh.net>2021-05-07 20:39:09 +0200
commitf3e52bd763513190de60e7f6b68c50b34ab80fee (patch)
treef55ecf3336d47e8f759d43c0918a38f4750164e1 /src/lib/environment_info.cc
parent7544dc823a8d89083c8481e6dbcca095522c3097 (diff)
Hide some more FFmpeg warnings.v2.15.143
Diffstat (limited to 'src/lib/environment_info.cc')
-rw-r--r--src/lib/environment_info.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 7a8fe68bc..2a6d47a00 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -19,12 +19,14 @@
*/
-#include "log.h"
#include "compose.hpp"
-#include "version.h"
#include "cross.h"
+#include "log.h"
+#include "version.h"
+#include "warnings.h"
#include <dcp/version.h>
#include <libssh/libssh.h>
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -32,6 +34,7 @@ extern "C" {
#include <libswscale/swscale.h>
#include <libavutil/pixfmt.h>
}
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include "i18n.h"