diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
| commit | 39bc73fe192f932ed6695eb87b19de446e8b4f55 (patch) | |
| tree | 4811b0642b7fcd73206b037da4ffb342e90ce6dc /src/lib/video_decoder.h | |
| parent | bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569 (diff) | |
| parent | 884093edac5f63d26c02d411c73dfb52376ccf8f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 145baa40b..2c0028fd1 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -32,7 +32,7 @@ #include "content_video.h" class VideoContent; -class Image; +class ImageProxy; /** @class VideoDecoder * @brief Parent for classes which decode video. @@ -55,7 +55,7 @@ public: protected: void seek (ContentTime time, bool accurate); - void video (boost::shared_ptr<const Image>, VideoFrame frame); + void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame); std::list<ContentVideo> decoded_video (VideoFrame frame); boost::shared_ptr<const VideoContent> _video_content; |