From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 Jul 2021 02:02:19 +0200
Subject: Use dcp::compose rather than our own.

---
 src/lib/ffmpeg_decoder.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.cc')

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;
-- 
cgit v1.2.3