From 86d185b84e9fce2c27ea99e5add202b0ab28b631 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 27 Jun 2013 18:56:48 +0100
Subject: [PATCH] Try moving run_ffprobe to before we start using FFmpeg
 ourselves.

---
 src/lib/film.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3d9b3eeb4..827c62082 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -943,6 +943,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> ();
@@ -998,8 +1001,6 @@ Film::set_content (string c)
 	if (content_type() == STILL) {
 		set_use_content_audio (false);
 	}
-
-	run_ffprobe (c, file ("ffprobe.log"), _log);
 }
 
 void
-- 
2.30.2