summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-22 17:36:11 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-22 17:36:11 +0100
commit596441a4e8cf03a88113646ca6da2f90e721a38b (patch)
treebf364e57aecc1f019d69b8faf32b8818eaa9d98b /src/lib/ffmpeg_decoder.h
parent11c70b0e3051517e7bb96a7d6fa53053dab6e978 (diff)
Various hacks.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
-rw-r--r--src/lib/ffmpeg_decoder.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 1c3f252fd..3b629e3ae 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -62,13 +62,15 @@ public:
FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio, bool subtitles);
~FFmpegDecoder ();
+ bool pass ();
+ bool seek (Time);
+ bool seek_back ();
+ bool seek_forward ();
+ Time next () const;
+
float video_frame_rate () const;
libdcp::Size native_size () const;
ContentVideoFrame video_length () const;
- int time_base_numerator () const;
- int time_base_denominator () const;
- int sample_aspect_ratio_numerator () const;
- int sample_aspect_ratio_denominator () const;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
return _subtitle_streams;
@@ -78,11 +80,6 @@ public:
return _audio_streams;
}
- bool seek (Time);
- bool seek_forward ();
- bool seek_back ();
- bool pass ();
-
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
return _ffmpeg_content;
}