projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the resampled rate to calculate the slack threshold rather than just 48kHz (...
[dcpomatic.git]
/
src
/
lib
/
environment_info.cc
diff --git
a/src/lib/environment_info.cc
b/src/lib/environment_info.cc
index 2a6d47a005f1d077a3bea152840a9d7a05934a56..2e0347c79dccb78bc282f7b6f42c2cbfadea3d54 100644
(file)
--- a/
src/lib/environment_info.cc
+++ b/
src/lib/environment_info.cc
@@
-23,10
+23,10
@@
#include "cross.h"
#include "log.h"
#include "version.h"
#include "cross.h"
#include "log.h"
#include "version.h"
-#include "warnings.h"
#include <dcp/version.h>
#include <dcp/version.h>
+#include <dcp/warnings.h>
#include <libssh/libssh.h>
#include <libssh/libssh.h>
-
DCPOMATIC
_DISABLE_WARNINGS
+
LIBDCP
_DISABLE_WARNINGS
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@
-34,7
+34,7
@@
extern "C" {
#include <libswscale/swscale.h>
#include <libavutil/pixfmt.h>
}
#include <libswscale/swscale.h>
#include <libavutil/pixfmt.h>
}
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include "i18n.h"
#include <boost/thread.hpp>
#include "i18n.h"