Use dcp::file_to_string().

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 5f29b64da51b498e8a656bc56cce9933f365ef70..1ce375594b531229ead3ee6dbd0f68cdec1f0577 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -181,9 +181,9 @@ FFmpegEncoder::go ()
                        if (!v.first) {
                                throw DecodeError(String::compose("Error during decoding: %1", e.summary()));
                        }
-                       shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
+                       auto fe = encoder->get (v.first->eyes());
                        if (fe) {
-                               fe->video(v.first, v.second);
+                               fe->video(v.first, v.second - reel->from);
                        }
                }
 
@@ -194,7 +194,7 @@ FFmpegEncoder::go ()
                        _last_time = i;
                }
 
-               shared_ptr<Job> job = _job.lock ();
+               auto job = _job.lock ();
                if (job) {
                        job->set_progress (float(i.get()) / _film->length().get());
                }
@@ -277,7 +277,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
                }
        }
 
-       map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
+       auto i = _encoders.find (eyes);
        DCPOMATIC_ASSERT (i != _encoders.end());
        return i->second;
 }