From c27d14badb229c24533db65dbaee1939dce89455 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 Apr 2021 21:20:10 +0200 Subject: Make DCP text track language properly optional and ignore bad values on imported DCPs (#1950). --- src/lib/subtitle_encoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/subtitle_encoder.cc') diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc index b61876ad6..66957270f 100644 --- a/src/lib/subtitle_encoder.cc +++ b/src/lib/subtitle_encoder.cc @@ -149,8 +149,8 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional tr s->set_content_title_text (_film->name()); if (lang.first) { s->set_language (*lang.first); - } else if (!track->language.empty()) { - s->set_language (dcp::LanguageTag(track->language)); + } else if (track->language) { + s->set_language (track->language.get()); } s->set_edit_rate (dcp::Fraction (_film->video_frame_rate(), 1)); s->set_reel_number (_reel_index + 1); -- cgit v1.2.3