Skip to content

Commit 3f00a94

Browse files
committed
changed path to ffmpeg
Signed-off-by: Ken Museth <ken.museth@gmail.com>
1 parent 157cf39 commit 3f00a94

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

openvdb_cmd/vdb_tool/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ endif()
117117
if(OPENVDB_TOOL_USE_MPEG)
118118
target_compile_definitions(vdb_tool_common INTERFACE "VDB_TOOL_USE_MPEG")
119119
find_program(FFMPEG_PATH NAMES ffmpeg REQUIRED)
120+
target_compile_definitions(vdb_tool_common INTERFACE "VDB_TOOL_FFMPEG_PATH=\"${FFMPEG_PATH}\"")
120121
endif()
121122

122123
if(OPENVDB_TOOL_USE_EXR)

openvdb_cmd/vdb_tool/include/Tool.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@
113113
#include <cstdlib>// for std::system
114114
#endif
115115

116+
#ifndef VDB_TOOL_FFMPEG_PATH
117+
#define VDB_TOOL_FFMPEG_PATH "ffmpeg"
118+
#endif
119+
116120
namespace openvdb {
117121
OPENVDB_USE_VERSION_NAMESPACE
118122
namespace OPENVDB_VERSION_NAME {
@@ -3354,7 +3358,7 @@ void Tool::movie()
33543358
const std::string flip = mParser.get<std::string>("flip");
33553359
if (mParser.verbose) mTimer.start("movie");
33563360

3357-
std::string cmd("ffmpeg"), log("log.txt");
3361+
std::string cmd("\"" VDB_TOOL_FFMPEG_PATH "\""), log("log.txt");
33583362
cmd += " -loglevel error";// only log error messages
33593363
if (contains(input, '*')) cmd += " -pattern_type glob";// support expanding shell-like wildcard patterns (globbing)
33603364
cmd += " -i \'" + input + "\'";// specify multiple input files as "input_*.ppm"

0 commit comments

Comments
 (0)