summaryrefslogtreecommitdiff
path: root/src/lib/text_subtitle_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-09 23:28:41 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-09 23:28:41 +0100
commit31a33018f113cb7b631dd7bb4d0ed2a7de914cd8 (patch)
tree902e0305d81301d6f190750decca64f07111891a /src/lib/text_subtitle_content.cc
parente8381aef2057a72270da9dc3d40e935ac56024b0 (diff)
Fix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles along the way.
Diffstat (limited to 'src/lib/text_subtitle_content.cc')
-rw-r--r--src/lib/text_subtitle_content.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 37ad5649a..24a328d08 100644
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -34,8 +34,6 @@ using std::string;
using std::cout;
using boost::shared_ptr;
-std::string const TextSubtitleContent::font_id = "font";
-
TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
{
@@ -60,7 +58,7 @@ TextSubtitleContent::examine (boost::shared_ptr<Job> job)
boost::mutex::scoped_lock lm (_mutex);
_length = s.length ();
- subtitle->add_font (shared_ptr<Font> (new Font (font_id)));
+ subtitle->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
}
string