diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-27 18:56:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-27 18:56:48 +0100 |
| commit | 86d185b84e9fce2c27ea99e5add202b0ab28b631 (patch) | |
| tree | 781d6c6da1e055b4e28a6df7b81d9561bdc4a800 /src/lib | |
| parent | 814f799b280cbf8e73f61ad283a199e211ed0c5e (diff) | |
Try moving run_ffprobe to before we start using FFmpeg ourselves.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 5 |
1 files 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 |