projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 5dd078553659b21d3c09bcf8a030ea77e73ad783..64c66ea55caf8bc64adb863aac01966e314820d2 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-19,12
+19,14
@@
#include "video_decoder.h"
#include "image.h"
+#include "image_proxy.h"
#include "content_video.h"
#include "i18n.h"
using std::cout;
using std::list;
+using std::max;
using boost::shared_ptr;
using boost::optional;