projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump private git so that we use Liberation Sans rather than Arial for a subtitle...
[dcpomatic.git]
/
src
/
lib
/
environment_info.cc
diff --git
a/src/lib/environment_info.cc
b/src/lib/environment_info.cc
index 7a8fe68bc0c88c350835859b8c87b55bffbd42e1..2e0347c79dccb78bc282f7b6f42c2cbfadea3d54 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 <dcp/version.h>
#include <dcp/version.h>
+#include <dcp/warnings.h>
#include <libssh/libssh.h>
#include <libssh/libssh.h>
+LIBDCP_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>
}
+LIBDCP_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include "i18n.h"
#include <boost/thread.hpp>
#include "i18n.h"