diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-21 18:44:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-21 18:44:52 +0000 |
| commit | 7d67f4a38bf7de1b901facf5390a730d307de671 (patch) | |
| tree | 57fcb21affed7b7f4f153da9ec000271a106190a /src/lib/ffmpeg_decoder.h | |
| parent | a5b59faff75265d3256ad0dbd9f0c69e51e31ce4 (diff) | |
Add some more tests; improve seeking.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index e50b248cf..55b624bd6 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -71,9 +71,9 @@ private: void maybe_add_subtitle (); boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size); - bool seek_overrun_finished (ContentTime, ContentTime, ContentTime) const; + bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const; bool seek_final_finished (int, int) const; - int minimal_run (boost::function<bool (ContentTime, ContentTime, int)>); + int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>); void seek_and_flush (int64_t); AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle |