projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error when loading encrypted DCPs (#2257).
[dcpomatic.git]
/
test
/
stream_test.cc
diff --git
a/test/stream_test.cc
b/test/stream_test.cc
index 25c2d98a689bf8a06a4e73af1bc289ae2079b55b..fe64e147e3b8b48eeb2e24a33a70cbc02c8e86cc 100644
(file)
--- a/
test/stream_test.cc
+++ b/
test/stream_test.cc
@@
-25,11
+25,11
@@
#include "lib/film.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/film.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_audio_stream.h"
-#include "lib/warnings.h"
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/test/unit_test.hpp>
using std::pair;
#include <boost/test/unit_test.hpp>
using std::pair;