Hand-apply d3bc61f0af33fedf02ac1a28cf91989ee9cd2fb6 from master;

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index bb4e022308dc9882dff57d5a0959d0a014cf9cab..e09e710417755a2701eeb53e296c5c8323514505 100644 (file)
--- 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)
+FFmpegContent::examine (shared_ptr<Job> job, bool calculate_digest)
 {
        job->set_progress_unknown ();
 
-       Content::examine (job);
+       Content::examine (job, calculate_digest);
 
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
        take_from_video_examiner (examiner);
@@ -382,7 +382,7 @@ FFmpegContent::audio_analysis_path () const
        */
 
        boost::filesystem::path p = film->audio_analysis_dir ();
-       string name = digest ();
+       string name = digest().get_value_or ("X");
        if (audio_stream ()) {
                name += "_" + audio_stream()->identifier ();
        }