projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 5c195ee1b781227637068f58ff62bf5425ca1612..46fc97fb31b74bdf14f6093dd0d973e34fa78709 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-114,6
+114,6
@@
TranscodeJob::remaining_time () const
}
/* Compute approximate proposed length here, as it's only here that we need it */
}
/* Compute approximate proposed length here, as it's only here that we need it */
-
Output
VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
+ VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
return left / fps;
}
return left / fps;
}