From f3e52bd763513190de60e7f6b68c50b34ab80fee Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 7 May 2021 19:13:04 +0200
Subject: [PATCH] Hide some more FFmpeg warnings.

---
 src/lib/audio_analyser.cc     | 3 +++
 src/lib/cross_linux.cc        | 3 +++
 src/lib/environment_info.cc   | 7 +++++--
 src/lib/ffmpeg_file_encoder.h | 3 +++
 src/lib/ffmpeg_image_proxy.cc | 2 +-
 src/lib/ffmpeg_stream.cc      | 2 +-
 src/lib/ffmpeg_wrapper.cc     | 5 ++++-
 src/lib/filter.cc             | 3 +++
 src/lib/filter_graph.h        | 3 +++
 src/lib/util.cc               | 2 ++
 10 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/lib/audio_analyser.cc b/src/lib/audio_analyser.cc
index 3caa997df..3868e05b7 100644
--- a/src/lib/audio_analyser.cc
+++ b/src/lib/audio_analyser.cc
@@ -31,12 +31,15 @@
 #include "filter.h"
 #include "playlist.h"
 #include "types.h"
+#include "warnings.h"
 extern "C" {
 #include <leqm_nrt.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libavutil/channel_layout.h>
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 #include <libavfilter/f_ebur128.h>
 #endif
+DCPOMATIC_ENABLE_WARNINGS
 }
 
 
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index a3dbdebf2..326e590b8 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -26,11 +26,14 @@
 #include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "log.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <glib.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavformat/avio.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
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"
diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 8a727106a..330ae1ff9 100644
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -27,11 +27,14 @@
 #include "event_history.h"
 #include "audio_mapping.h"
 #include "log.h"
+#include "warnings.h"
 #include <dcp/key.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class ExportAudioStream;
diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 7b2322101..ab9b94b14 100644
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -28,12 +28,12 @@
 #include "util.h"
 #include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
-DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 60327ab0d..2d85a90bb 100644
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -24,10 +24,10 @@
 #include <dcp/raw_convert.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
 extern "C" {
 #include <libavformat/avformat.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
 using dcp::raw_convert;
diff --git a/src/lib/ffmpeg_wrapper.cc b/src/lib/ffmpeg_wrapper.cc
index aacaeaae3..dbd2dce9f 100644
--- a/src/lib/ffmpeg_wrapper.cc
+++ b/src/lib/ffmpeg_wrapper.cc
@@ -19,10 +19,13 @@
 */
 
 
+#include "ffmpeg_wrapper.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavformat/avformat.h>
 }
-#include "ffmpeg_wrapper.h"
+DCPOMATIC_ENABLE_WARNINGS
 #include <new>
 
 
diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 1c1039065..5631af55a 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -25,9 +25,12 @@
 
 
 #include "filter.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index eccfe4954..d5a2da7a2 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -26,9 +26,12 @@
 #define DCPOMATIC_FILTER_GRAPH_H
 
 #include "util.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/buffersink.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 
 struct AVFilterContext;
 struct AVFrame;
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2b686da69..6286d1a65 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -54,11 +54,13 @@
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
 #include <dcp/atmos_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 #include <curl/curl.h>
 #include <glib.h>
 #include <pangomm/init.h>
-- 
2.30.2