projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7544dc8
)
Hide some more FFmpeg warnings.
v2.15.143
author
Carl Hetherington
<cth@carlh.net>
Fri, 7 May 2021 17:13:04 +0000
(19:13 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 7 May 2021 18:39:09 +0000
(20:39 +0200)
src/lib/audio_analyser.cc
patch
|
blob
|
history
src/lib/cross_linux.cc
patch
|
blob
|
history
src/lib/environment_info.cc
patch
|
blob
|
history
src/lib/ffmpeg_file_encoder.h
patch
|
blob
|
history
src/lib/ffmpeg_image_proxy.cc
patch
|
blob
|
history
src/lib/ffmpeg_stream.cc
patch
|
blob
|
history
src/lib/ffmpeg_wrapper.cc
patch
|
blob
|
history
src/lib/filter.cc
patch
|
blob
|
history
src/lib/filter_graph.h
patch
|
blob
|
history
src/lib/util.cc
patch
|
blob
|
history
diff --git
a/src/lib/audio_analyser.cc
b/src/lib/audio_analyser.cc
index 3caa997df139951f12f27611816e3170c78b51e4..3868e05b7196e4724e243d17acdfe78b11a476d9 100644
(file)
--- 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 "filter.h"
#include "playlist.h"
#include "types.h"
+#include "warnings.h"
extern "C" {
#include <leqm_nrt.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
#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 a3dbdebf2a4b9fb5e3c10a1959d0d2b5985c19c0..326e590b8b8ce7e2d3840024f06dad240f836d5f 100644
(file)
--- 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 "dcpomatic_log.h"
#include "exceptions.h"
#include "log.h"
+#include "warnings.h"
#include <dcp/raw_convert.h>
#include <glib.h>
#include <dcp/raw_convert.h>
#include <glib.h>
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavformat/avio.h>
}
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>
#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 7a8fe68bc0c88c350835859b8c87b55bffbd42e1..2a6d47a005f1d077a3bea152840a9d7a05934a56 100644
(file)
--- a/
src/lib/environment_info.cc
+++ b/
src/lib/environment_info.cc
@@
-19,12
+19,14
@@
*/
*/
-#include "log.h"
#include "compose.hpp"
#include "compose.hpp"
-#include "version.h"
#include "cross.h"
#include "cross.h"
+#include "log.h"
+#include "version.h"
+#include "warnings.h"
#include <dcp/version.h>
#include <libssh/libssh.h>
#include <dcp/version.h>
#include <libssh/libssh.h>
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@
-32,6
+34,7
@@
extern "C" {
#include <libswscale/swscale.h>
#include <libavutil/pixfmt.h>
}
#include <libswscale/swscale.h>
#include <libavutil/pixfmt.h>
}
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include "i18n.h"
#include <boost/thread.hpp>
#include "i18n.h"
diff --git
a/src/lib/ffmpeg_file_encoder.h
b/src/lib/ffmpeg_file_encoder.h
index 8a727106a7fe44194ceb72b957ea0cff4b0ce7c7..330ae1ff97bc0757efc483e2668f5d1aeed7bb05 100644
(file)
--- 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 "event_history.h"
#include "audio_mapping.h"
#include "log.h"
+#include "warnings.h"
#include <dcp/key.h>
#include <dcp/key.h>
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
}
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
}
+DCPOMATIC_ENABLE_WARNINGS
class ExportAudioStream;
class ExportAudioStream;
diff --git
a/src/lib/ffmpeg_image_proxy.cc
b/src/lib/ffmpeg_image_proxy.cc
index 7b23221011474a246675977f9f7b260b29199484..ab9b94b149e10e0ffdeafae194742d4e7ccef930 100644
(file)
--- 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>
#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>
}
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>
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
diff --git
a/src/lib/ffmpeg_stream.cc
b/src/lib/ffmpeg_stream.cc
index 60327ab0d9d87c0f199215da1f05dda10dd67dd8..2d85a90bb69fcf81bc595b2ec3f96439bb5b1de4 100644
(file)
--- 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>
#include <dcp/raw_convert.h>
DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
extern "C" {
#include <libavformat/avformat.h>
}
extern "C" {
#include <libavformat/avformat.h>
}
+DCPOMATIC_ENABLE_WARNINGS
using std::string;
using dcp::raw_convert;
using std::string;
using dcp::raw_convert;
diff --git
a/src/lib/ffmpeg_wrapper.cc
b/src/lib/ffmpeg_wrapper.cc
index aacaeaae3021dbb27477542581b267104e1dc2e2..dbd2dce9f725a7bb3cbda6287b807f7cb89940a2 100644
(file)
--- 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>
}
extern "C" {
#include <libavformat/avformat.h>
}
-#include "ffmpeg_wrapper.h"
+DCPOMATIC_ENABLE_WARNINGS
#include <new>
#include <new>
diff --git
a/src/lib/filter.cc
b/src/lib/filter.cc
index 1c1039065227c4c5c3fdbc27abf8ded1a331b8c8..5631af55a8885a5d1e6a02cad27d1cb7e85bd9a8 100644
(file)
--- a/
src/lib/filter.cc
+++ b/
src/lib/filter.cc
@@
-25,9
+25,12
@@
#include "filter.h"
#include "filter.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavfilter/avfilter.h>
}
extern "C" {
#include <libavfilter/avfilter.h>
}
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
diff --git
a/src/lib/filter_graph.h
b/src/lib/filter_graph.h
index eccfe4954ea1442e421f863f5a5462638c3c1325..d5a2da7a29be925cbbb6e572544a8390dd2c57ba 100644
(file)
--- a/
src/lib/filter_graph.h
+++ b/
src/lib/filter_graph.h
@@
-26,9
+26,12
@@
#define DCPOMATIC_FILTER_GRAPH_H
#include "util.h"
#define DCPOMATIC_FILTER_GRAPH_H
#include "util.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavfilter/buffersink.h>
}
extern "C" {
#include <libavfilter/buffersink.h>
}
+DCPOMATIC_ENABLE_WARNINGS
struct AVFilterContext;
struct AVFrame;
struct AVFilterContext;
struct AVFrame;
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 2b686da698518495bd77cde42b8b6862213127df..6286d1a658dd9fde4bb1320bbd140586f49b05b4 100644
(file)
--- 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>
#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>
}
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>
#include <curl/curl.h>
#include <glib.h>
#include <pangomm/init.h>