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/video_decoder.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index ce42f428f..a05c30f64 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -19,7 +19,6 @@ */ -#include "compose.hpp" #include "film.h" #include "frame_interval_checker.h" #include "image.h" @@ -27,6 +26,7 @@ #include "log.h" #include "raw_image_proxy.h" #include "video_decoder.h" +#include <dcp/compose.h> #include <iostream> #include "i18n.h" @@ -82,7 +82,7 @@ VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> im if (_frame_interval_checker->guess() == FrameIntervalChecker::PROBABLY_NOT_3D && vft == VideoFrameType::THREE_D) { boost::throw_exception ( DecodeError( - String::compose( + dcp::compose( _("The content file %1 is set as 3D but does not appear to contain 3D images. Please set it to 2D. " "You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab."), _content->path(0) |