Fix ffprobe on windows to work without a command window etc.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 81c7de77f72bb0b3a04f1e7d906011c8777bcca8..3d9b3eeb4e4f8fafff480bc8bdf78fa180b1ee81 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -52,6 +52,7 @@
 #include "audio_decoder.h"
 #include "sndfile_decoder.h"
 #include "analyse_audio_job.h"
+#include "cross.h"
 
 #include "i18n.h"
 
@@ -218,6 +219,10 @@ Film::video_state_identifier () const
          << "_" << j2k_bandwidth()
          << "_" << boost::lexical_cast<int> (colour_lut());
 
+       if (trim_type() == ENCODE) {
+               s << "_" << trim_start() << "_" << trim_end();
+       }
+
        if (dcp_ab()) {
                pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
                s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
@@ -993,6 +998,8 @@ Film::set_content (string c)
        if (content_type() == STILL) {
                set_use_content_audio (false);
        }
+
+       run_ffprobe (c, file ("ffprobe.log"), _log);
 }
 
 void