Fix typo causing incorrectly timed subtitles when their content

position is non-zero.

Reported-by: Thierry Journet

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 19beeb5d9..84efa7546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-29  Carl Hetherington  <cth@carlh.net>
+
+	* Fix missing subtitles when subtitled content is at a non-zero position.
+
 2014-01-28  Carl Hetherington  <cth@carlh.net>
 
 	* Use Mbit/s instead of the incorrect MBps.
diff --git a/src/lib/player.cc b/src/lib/player.cc
index ce5109733..1c54d0fc5 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -695,7 +695,7 @@ Player::update_subtitle ()
 		to = rint (to * vc->video_frame_rate() / _film->video_frame_rate());
 	}
 	
-	_out_subtitle.from = from * piece->content->position ();
+	_out_subtitle.from = from + piece->content->position ();
 	_out_subtitle.to = to + piece->content->position ();
 }