diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/lib/ffmpeg_image_proxy.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/ffmpeg_image_proxy.cc')
| -rw-r--r-- | src/lib/ffmpeg_image_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index 54fb1c468..e26f4b040 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -19,7 +19,6 @@ */ -#include "compose.hpp" #include "cross.h" #include "dcpomatic_socket.h" #include "exceptions.h" @@ -27,6 +26,7 @@ #include "image.h" #include "util.h" #include "warnings.h" +#include <dcp/compose.h> #include <dcp/raw_convert.h> DCPOMATIC_DISABLE_WARNINGS extern "C" { @@ -160,7 +160,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const if (_path) { throw OpenFileError (_path->string(), e, OpenFileError::READ); } else { - boost::throw_exception(DecodeError(String::compose(_("Could not decode image (%1)"), e))); + boost::throw_exception(DecodeError(dcp::compose(_("Could not decode image (%1)"), e))); } } |