From dc87445987c00b85a44b6372e43894067fae44b3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Dec 2013 01:12:40 +0000 Subject: Merge 1.0 and some subtitling fixes. --- src/lib/ffmpeg_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index c6e4217b6..298284512 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -562,8 +562,8 @@ FFmpegDecoder::decode_subtitle_packet () double const packet_time = static_cast (sub.pts) / AV_TIME_BASE; /* hence start time for this sub */ - DCPTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ; - DCPTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ; + ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ; + ContentTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ; AVSubtitleRect const * rect = sub.rects[0]; -- cgit v1.2.3