diff options
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 1 | ||||
| -rw-r--r-- | src/lib/text_subtitle_content.h | 4 | ||||
| -rw-r--r-- | src/lib/text_subtitle_decoder.cc | 1 |
4 files changed, 6 insertions, 2 deletions
@@ -262,7 +262,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options), - ('libdcp', '42f74b7'), + ('libdcp', '4b8c626'), ('libsub', 'b9fb00d')) def configure_options(target): diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index bfc3b6132..e5e1f04ac 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -598,6 +598,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period) */ 1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22), dcp::VALIGN_TOP, + dcp::DIRECTION_LTR, k.text, static_cast<dcp::Effect> (0), dcp::Colour (255, 255, 255), diff --git a/src/lib/text_subtitle_content.h b/src/lib/text_subtitle_content.h index 52d44ae54..ad63a0e7d 100644 --- a/src/lib/text_subtitle_content.h +++ b/src/lib/text_subtitle_content.h @@ -27,7 +27,9 @@ public: static int const TEXT_SUBTITLE_OUTLINE_COLOUR; }; - +/** @class TextSubtitleContent + * @brief SubRip or SSA subtitles. + */ class TextSubtitleContent : public SubtitleContent { public: diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc index b40f83068..c94a002f5 100644 --- a/src/lib/text_subtitle_decoder.cc +++ b/src/lib/text_subtitle_decoder.cc @@ -93,6 +93,7 @@ TextSubtitleDecoder::pass (PassReason, bool) */ 1.015 - ((1 + highest - i.vertical_position.line.get()) * 1.5 / 22), dcp::VALIGN_TOP, + dcp::DIRECTION_LTR, j.text, content->outline() ? dcp::BORDER : dcp::NONE, content->outline_colour(), |