projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
814f799
)
Try moving run_ffprobe to before we start using FFmpeg ourselves.
author
Carl Hetherington
<cth@carlh.net>
Thu, 27 Jun 2013 17:56:48 +0000
(18:56 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 27 Jun 2013 17:56:48 +0000
(18:56 +0100)
src/lib/film.cc
patch
|
blob
|
history
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 3d9b3eeb4e4f8fafff480bc8bdf78fa180b1ee81..827c62082804e3a1c39f274552fd95a032a53c60 100644
(file)
--- 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