diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-01 00:26:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-01 00:26:37 +0000 |
| commit | 22873931f874a87fcf6a0077eddbec0f97eb3423 (patch) | |
| tree | cabf1595fd8814e62730e8d846ca4288682d5cdd /src/lib/ffmpeg.h | |
| parent | 030c74f085718ea276c6e55a7a7c7de267a9ebf3 (diff) | |
Subtitle "to" times used to be stored against their "from" times.
Sadly an example shows that from times are not unique. This patch
uses a hash of stuff from the first AVSubtitle as the key.
Diffstat (limited to 'src/lib/ffmpeg.h')
| -rw-r--r-- | src/lib/ffmpeg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index b3bc13e5c..0b195268a 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -56,7 +56,8 @@ protected: std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate ) const; - static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &); + static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub); + static std::string subtitle_id (AVSubtitle const & sub); boost::shared_ptr<const FFmpegContent> _ffmpeg_content; |