Fix failure on 1-frame-back seek (#604).

[dcpomatic.git] / src / lib / transcoder.cc

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 1012c45442b69320e9b4bd7aac14143167755065..8aed205741ec9aaf454ec70026a4b70d68bdaaba 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -42,9 +42,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
+/** Construct a transcoder.
  *  @param f Film that we are transcoding.
- *  @param e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
        : _film (f)
@@ -62,7 +62,13 @@ Transcoder::go ()
        _encoder->begin ();
 
        DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
-       for (DCPTime t; t < _film->length(); t += frame) {
+       DCPTime const length = _film->length ();
+
+       if (!_film->burn_subtitles ()) {
+               _writer->write (_player->get_subtitle_fonts ());
+       }
+       
+       for (DCPTime t; t < length; t += frame) {
                list<shared_ptr<PlayerVideo> > v = _player->get_video (t, true);
                for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
                        _encoder->enqueue (*i);