diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-24 00:57:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-24 00:57:47 +0100 |
| commit | 355e95ed35092b05896dd1e94e4383df003ded84 (patch) | |
| tree | 9f579e80ec0d9b031db085704b10377c0f826e68 | |
| parent | 20021c03b349ef6cc0ffc04a2d75704fc0c8a40e (diff) | |
Add avdevice DLL to windows installer; log ffprobe command.
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 1 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 1 | ||||
| -rw-r--r-- | src/lib/film.cc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index a36384902..6dd1de2d9 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -32,6 +32,7 @@ File "%deps%/bin/avcodec-55.dll" File "%deps%/bin/avfilter-3.dll" File "%deps%/bin/avformat-55.dll" File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/avdevice-55.dll" File "%deps%/bin/dcp.dll" File "%deps%/bin/libintl-8.dll" File "%deps%/bin/kumu-libdcp.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index 7f2b1da7b..e98a3a6d8 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -42,6 +42,7 @@ File "%deps%/bin/avcodec-55.dll" File "%deps%/bin/avfilter-3.dll" File "%deps%/bin/avformat-55.dll" File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/avdevice-55.dll" File "%deps%/bin/dcp.dll" File "%deps%/bin/libintl-8.dll" File "%deps%/bin/kumu-libdcp.dll" diff --git a/src/lib/film.cc b/src/lib/film.cc index 942801a9f..c4a7c4316 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1006,6 +1006,7 @@ Film::set_content (string c) #endif ffprobe += c; ffprobe += " 2> " + file ("ffprobe.log"); + log()->log (String::compose ("Probing with %1", ffprobe)); system (ffprobe.c_str ()); } |
