summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-11-21 16:57:15 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commitde2af791bdfdcd653752cba970e59efc7bf810c7 (patch)
tree1aa5dbc35daee0babd0def347944a6bea4154deb /src/lib/ffmpeg_decoder.h
parent06152300e69e8faca44ff8d7f12a6fd354848b9a (diff)
Basic grunt-work, untested and unfinished, but it compiles.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
-rw-r--r--src/lib/ffmpeg_decoder.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 76755c1fc..82472c164 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -46,11 +46,12 @@ class FFmpegDecoder : public FFmpeg, public Decoder
public:
FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+ void pass ();
+ void seek (ContentTime time, bool);
+
private:
friend struct ::ffmpeg_pts_offset_test;
- bool pass (PassReason, bool accurate);
- void seek (ContentTime time, bool);
void flush ();
AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
@@ -66,9 +67,6 @@ private:
void maybe_add_subtitle ();
boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
- std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
- std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
boost::shared_ptr<Log> _log;
std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;