summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-26 16:47:39 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-26 22:32:11 +0100
commitf188128e2577942f030374631d3cf1324a00624a (patch)
tree72c1b82d5b7f90069b7ba2a05e8b209cd527c3e4 /src/lib/video_decoder.h
parentc4ea2ff06b31ccd20daadbdc968e397eb13a7e36 (diff)
{Video,Audio}Frame -> Frame.
Diffstat (limited to 'src/lib/video_decoder.h')
-rw-r--r--src/lib/video_decoder.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 5381fb21e..5266604c5 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -43,7 +43,7 @@ class VideoDecoder : public virtual Decoder
public:
VideoDecoder (boost::shared_ptr<const VideoContent> c);
- std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+ std::list<ContentVideo> get_video (Frame frame, bool accurate);
boost::shared_ptr<const VideoContent> video_content () const {
return _video_content;
@@ -60,10 +60,10 @@ protected:
friend struct video_decoder_fill_test2;
void seek (ContentTime time, bool accurate);
- void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
- std::list<ContentVideo> decoded_video (VideoFrame frame);
- void fill_2d (VideoFrame from, VideoFrame to);
- void fill_3d (VideoFrame from, VideoFrame to, Eyes);
+ void video (boost::shared_ptr<const ImageProxy>, Frame frame);
+ std::list<ContentVideo> decoded_video (Frame frame);
+ void fill_2d (Frame from, Frame to);
+ void fill_3d (Frame from, Frame to, Eyes);
boost::shared_ptr<const VideoContent> _video_content;
std::list<ContentVideo> _decoded_video;