Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index c4dc9d830d0823b0701be08a760637425f0cf41e..6bc503dc1c3b4683df14ed09db1e13bc7e2ca684 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -948,6 +948,9 @@ Film::set_content (string c)
                _content = c;
        }
 
+       /* Do this before we start using FFmpeg ourselves */
+       run_ffprobe (c, file ("ffprobe.log"), _log);
+       
        /* Reset streams here in case the new content doesn't have one or the other */
        _content_audio_stream = shared_ptr<AudioStream> ();
        _subtitle_stream = shared_ptr<SubtitleStream> ();
@@ -1003,8 +1006,6 @@ Film::set_content (string c)
        if (content_type() == STILL) {
                set_use_content_audio (false);
        }
-
-       run_ffprobe (c, file ("ffprobe.log"), _log);
 }
 
 void