summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-23 08:07:38 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-23 08:07:38 +0100
commite8819ad7580f25eea7ca3c59cf0a3979d76a6b44 (patch)
tree1ecec7476192945084a822916c1d565f35054ade /src/lib/video_decoder.h
parent929b4c37eaf9593892f61df80309a8c8ad6c05a0 (diff)
Some more tidying up.
Diffstat (limited to 'src/lib/video_decoder.h')
-rw-r--r--src/lib/video_decoder.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 3a3bc252a..0f1432907 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -22,6 +22,7 @@
#include "video_source.h"
#include "decoder.h"
+#include "util.h"
class VideoContent;
@@ -41,14 +42,16 @@ public:
protected:
- void emit_video (boost::shared_ptr<Image>, bool, Time);
- void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
+ void video (boost::shared_ptr<Image>, bool, Time);
+ void subtitle (boost::shared_ptr<TimedSubtitle>);
Time _next_video;
private:
boost::shared_ptr<const VideoContent> _video_content;
boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+ FrameRateConversion _frame_rate_conversion;
+ bool _odd;
};
#endif