X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=1ce375594b531229ead3ee6dbd0f68cdec1f0577;hp=5f29b64da51b498e8a656bc56cce9933f365ef70;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 5f29b64da..1ce375594 100644 --- 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 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.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 >::const_iterator i = _encoders.find (eyes); + auto i = _encoders.find (eyes); DCPOMATIC_ASSERT (i != _encoders.end()); return i->second; }