diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-19 13:47:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-19 13:47:34 +0100 |
| commit | a6d892268ccdf8e50194c0168491c8a360bbb687 (patch) | |
| tree | 80d8007be63f7b9f52bdc46e0171d79454a94597 /src/lib/transcode_job.cc | |
| parent | 91273da19c689e44f3baa368d4b4efbe75cd8fe5 (diff) | |
| parent | 7370f2b159a539d4a7721a50d0f3dc56ba14c678 (diff) | |
Merge branch '1.0-alt-loop' into 1.0
Diffstat (limited to 'src/lib/transcode_job.cc')
| -rw-r--r-- | src/lib/transcode_job.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index f0faf7c63..6d5edd7c0 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -111,6 +111,6 @@ TranscodeJob::remaining_time () const } /* Compute approximate proposed length here, as it's only here that we need it */ - OutputVideoFrame const left = _film->time_to_video_frames (_film->length_with_loop ()) - _transcoder->video_frames_out(); + OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out(); return left / fps; } |