From fd198a9cb1f033773102f54603bd06b98f3c7fb1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 19 May 2024 23:27:34 +0200
Subject: Add and use Content::has_mapped_audio().

---
 src/lib/ffmpeg_decoder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index e0d9918b2..019e4f95c 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -89,7 +89,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmp
 		_pts_offset = {};
 	}
 
-	if (c->audio && !c->audio->mapping().mapped_output_channels().empty()) {
+	if (c->has_mapped_audio()) {
 		audio = make_shared<AudioDecoder>(this, c->audio, fast);
 	}
 
-- 
cgit v1.2.3


From ad5cc13514cb02b523fe1b553fc727e570dac6de Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 May 2024 20:47:56 +0100
Subject: Fix build with newer libsub.

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

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 019e4f95c..45983795b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -831,13 +831,8 @@ FFmpegDecoder::process_ass_subtitle (string ass, ContentTime from)
 	auto video_size = _ffmpeg_content->video->size();
 	DCPOMATIC_ASSERT(video_size);
 
-	auto raw = sub::SSAReader::parse_line (
-		base,
-		text,
-		video_size->width,
-		video_size->height,
-		sub::Colour(1, 1, 1)
-		);
+	sub::SSAReader::Context context(video_size->width, video_size->height, sub::Colour(1, 1, 1));
+	auto const raw = sub::SSAReader::parse_line(base, text, context);
 
 	for (auto const& i: sub::collect<vector<sub::Subtitle>>(raw)) {
 		only_text()->emit_plain_start (from, i);
-- 
cgit v1.2.3