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.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index 145baa40b0ca115acda97f8b33376d8712890193..2c0028fd1bcfa4ce6c6a8c831452608b89467041 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-32,7
+32,7
@@
#include "content_video.h"
class VideoContent;
#include "content_video.h"
class VideoContent;
-class Image;
+class Image
Proxy
;
/** @class VideoDecoder
* @brief Parent for classes which decode video.
/** @class VideoDecoder
* @brief Parent for classes which decode video.
@@
-55,7
+55,7
@@
public:
protected:
void seek (ContentTime time, bool accurate);
protected:
void seek (ContentTime time, bool accurate);
- void video (boost::shared_ptr<const Image>, VideoFrame frame);
+ void video (boost::shared_ptr<const Image
Proxy
>, VideoFrame frame);
std::list<ContentVideo> decoded_video (VideoFrame frame);
boost::shared_ptr<const VideoContent> _video_content;
std::list<ContentVideo> decoded_video (VideoFrame frame);
boost::shared_ptr<const VideoContent> _video_content;