diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-01 14:32:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-01 14:32:45 +0100 |
| commit | c98c87afe29d9ef74bdced8a9c96d7752f3fe80f (patch) | |
| tree | 9fad96b3e680ae368ef7488af80488edd4436394 /src/lib/video_decoder.h | |
| parent | bbbfb3208e74a4de2f9b4540a17ec43d4e3541a3 (diff) | |
Fix 3D support.
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 8715b9714..685b72bc8 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -35,7 +35,7 @@ class VideoDecoder : public virtual Decoder public: VideoDecoder (boost::shared_ptr<const VideoContent> c); - boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate); + std::list<ContentVideo> get_video (VideoFrame frame, bool accurate); boost::shared_ptr<const VideoContent> video_content () const { return _video_content; @@ -49,7 +49,7 @@ protected: void seek (ContentTime time, bool accurate); void video (boost::shared_ptr<const Image>, VideoFrame frame); - boost::optional<ContentVideo> decoded_video (VideoFrame frame); + std::list<ContentVideo> decoded_video (VideoFrame frame); boost::shared_ptr<const VideoContent> _video_content; std::list<ContentVideo> _decoded_video; |