diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-26 15:29:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-27 10:55:07 +0100 |
| commit | ba8a5a15cc27988e2bbc6acd470d8532f1d8e99f (patch) | |
| tree | 375bd068bbd86760f85fcd1264c1d8d76f2f1240 /src/lib/ffmpeg_decoder.h | |
| parent | f5a2789fcab274f2beda4a1e4ff59567158c9686 (diff) | |
Initial work on removing storage of subtitle times.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 65e4cf46a..bd7ba98b8 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -61,8 +61,8 @@ private: void decode_audio_packet (); void decode_subtitle_packet (); - void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period); - void decode_ass_subtitle (std::string ass, ContentTimePeriod period); + void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from); + void decode_ass_subtitle (std::string ass, ContentTime from); void maybe_add_subtitle (); boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const; @@ -73,4 +73,6 @@ private: boost::mutex _filter_graphs_mutex; ContentTime _pts_offset; + boost::optional<ContentTime> _current_subtitle_to; + bool _have_current_subtitle; }; |
