diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-23 23:17:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-23 23:17:36 +0000 |
| commit | 68f662ac50a00ad986e3bd258c3f7daac374ab26 (patch) | |
| tree | 2b8d4d7050ea1cd594997198fe05f3f4bbf57c21 /src/lib/ffmpeg_content.cc | |
| parent | a3c4945f77fa8e7123c30026654cb86e99343f50 (diff) | |
Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress reporting when scanning a file for length.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 66f78d541..d5fd592d6 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -169,7 +169,7 @@ FFmpegContent::examine (shared_ptr<Job> job, bool calculate_digest) Content::examine (job, calculate_digest); - shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ())); + shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job)); take_from_video_examiner (examiner); shared_ptr<const Film> film = _film.lock (); |