From 1eeba876ce09cedfa4c779bf3554372c01dc34c5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 1 Apr 2014 21:44:06 +0100
Subject: Various small fixes.

---
 src/lib/video_decoder.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/video_decoder.h')

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 7c7ec35b9..86a9489b1 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -25,17 +25,17 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
+#include "content_video.h"
 
 class VideoContent;
 class Image;
-class ContentVideo;
 
 class VideoDecoder : public virtual Decoder
 {
 public:
 	VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-	boost::shared_ptr<ContentVideo> get_video (VideoFrame frame, bool accurate);
+	boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
 	boost::shared_ptr<const VideoContent> video_content () const {
 		return _video_content;
@@ -45,10 +45,10 @@ protected:
 
 	void seek (ContentTime time, bool accurate);
 	void video (boost::shared_ptr<const Image>, VideoFrame frame);
-	boost::shared_ptr<ContentVideo> decoded_video (VideoFrame frame);
+	boost::optional<ContentVideo> decoded_video (VideoFrame frame);
 
 	boost::shared_ptr<const VideoContent> _video_content;
-	std::list<boost::shared_ptr<ContentVideo> > _decoded_video;
+	std::list<ContentVideo> _decoded_video;
 };
 
 #endif
-- 
cgit v1.2.3