summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-15 08:40:14 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-15 22:34:57 +0000
commit54d17e98a597334bf1ba2615e3eb6191088f606f (patch)
tree83a4f0c1acb2aab41a9cf279bc949474a214951a /src/lib/ffmpeg_content.h
parent57c49675889c0e0ad8cebece7a60bba08ba782d2 (diff)
Support SSA subtitles embedded within FFmpeg files.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 5437c5bf3..8bd84c144 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -102,7 +102,8 @@ public:
return _first_video;
}
- std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+ std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+ std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
protected:
void add_properties (std::list<std::pair<std::string, std::string> > &) const;