projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 148f5ae6496a5853c6e6ff88d5043181a956663a..4e3ecc983a75524d20582b135ed29b73c08e2bff 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-33,7
+33,8
@@
#include "lib/dcp_video.h"
#include "lib/scaler.h"
#include "lib/player_video.h"
#include "lib/dcp_video.h"
#include "lib/scaler.h"
#include "lib/player_video.h"
-#include "lib/image_proxy.h"
+#include "lib/raw_image_proxy.h"
+#include "lib/encoded_data.h"
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
@@
-103,6
+104,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
24,
200000000,
RESOLUTION_2K,
24,
200000000,
RESOLUTION_2K,
+ true,
log
)
);
log
)
);
@@
-185,6
+187,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
24,
200000000,
RESOLUTION_2K,
24,
200000000,
RESOLUTION_2K,
+ true,
log
)
);
log
)
);