projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_stream.cc
diff --git
a/src/lib/ffmpeg_stream.cc
b/src/lib/ffmpeg_stream.cc
index 2d85a90bb69fcf81bc595b2ec3f96439bb5b1de4..47f71d1195bcbb2a169b5661c31171a8bd165c11 100644
(file)
--- a/
src/lib/ffmpeg_stream.cc
+++ b/
src/lib/ffmpeg_stream.cc
@@
-20,14
+20,14
@@
#include "ffmpeg_stream.h"
#include "dcpomatic_assert.h"
#include "ffmpeg_stream.h"
#include "dcpomatic_assert.h"
-#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
extern "C" {
#include <libavformat/avformat.h>
}
#include <libxml++/libxml++.h>
extern "C" {
#include <libavformat/avformat.h>
}
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::string;
using dcp::raw_convert;
using std::string;
using dcp::raw_convert;