diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-18 21:13:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-18 21:13:53 +0000 |
| commit | 602fd58eff38fdfccc489b9f77b3ff0ca0009566 (patch) | |
| tree | f44645730c3b412fcc0c79f4bca73260567a362d /src/lib/ffmpeg_decoder.h | |
| parent | 039a55081427b1ff0026cd6b9ca787526d37ef92 (diff) | |
| parent | 0330d9b2924767d9240c5a25e9ed4327eb0a73bd (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 2011ef72f..89534a38c 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -100,11 +100,13 @@ public: void set_audio_stream (boost::shared_ptr<AudioStream>); void set_subtitle_stream (boost::shared_ptr<SubtitleStream>); - bool seek (SourceFrame); + bool seek (double); + bool seek_to_last (); private: bool pass (); + bool do_seek (double p, bool); PixelFormat pixel_format () const; AVSampleFormat audio_sample_format () const; int bytes_per_audio_sample () const; |