diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
| commit | 59e769023c392c332331567a1aea94660002c463 (patch) | |
| tree | e68d918e3c48f470a688b8bb5bf95590fb9c4916 /src/lib/ffmpeg_content.cc | |
| parent | 5af65f61bf6eba06c24025d63b43aec896a00c9c (diff) | |
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calculation.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index d5fd592d6..9e9473935 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -163,11 +163,11 @@ FFmpegContent::as_xml (xmlpp::Node* node) const } void -FFmpegContent::examine (shared_ptr<Job> job, bool calculate_digest) +FFmpegContent::examine (shared_ptr<Job> job) { job->set_progress_unknown (); - Content::examine (job, calculate_digest); + Content::examine (job); shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job)); take_from_video_examiner (examiner); @@ -367,7 +367,7 @@ FFmpegContent::audio_analysis_path () const */ boost::filesystem::path p = film->audio_analysis_dir (); - string name = digest().get_value_or ("X"); + string name = digest(); if (audio_stream ()) { name += "_" + audio_stream()->identifier (); } |