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_decoder.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 31fbde773..a1b44624e 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -39,10 +39,10 @@ #include "video_decoder.h" #include "film.h" #include "audio_decoder.h" -#include "compose.hpp" #include "text_content.h" #include "audio_content.h" #include "frame_interval_checker.h" +#include <dcp/compose.h> #include <dcp/subtitle_string.h> #include <sub/ssa_reader.h> #include <sub/subtitle.h> @@ -340,7 +340,7 @@ FFmpegDecoder::deinterleave_audio (AVFrame* frame) break; default: - throw DecodeError (String::compose(_("Unrecognised audio sample format (%1)"), static_cast<int>(format))); + throw DecodeError (dcp::compose(_("Unrecognised audio sample format (%1)"), static_cast<int>(format))); } return audio; |