diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-16 10:10:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-18 10:41:19 +0200 |
| commit | a9cb7313f7846f8b2bf9f96d19cf28abd7caf7fc (patch) | |
| tree | 020b1ed7922e97c9711641209efdab845cdf65fc /src/lib/ffmpeg_content.h | |
| parent | 5c5da23c412e9b922154f8934e16f3a51ff48bdc (diff) | |
Fix thinko in relative path change.
We have to canonicalise relative paths with respect to the film's
directory on load, otherwise we try to use the relative path and it's
interpreted against the current working directory.
This unfortunately requires the film's directory to be piped into quite
a lot of new places.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 1b3d3376e..a0fe9a0c0 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -55,7 +55,7 @@ class FFmpegContent : public Content { public: FFmpegContent (boost::filesystem::path); - FFmpegContent (cxml::ConstNodePtr, int version, std::list<std::string> &); + FFmpegContent (cxml::ConstNodePtr, boost::optional<boost::filesystem::path> film_directory, int version, std::list<std::string> &); FFmpegContent (std::vector<std::shared_ptr<Content>>); std::shared_ptr<FFmpegContent> shared_from_this () { |