From 5c91ae09c613348a6e2f576cb0eb5cc1ee467235 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 1 Feb 2019 19:50:59 +0000 Subject: [PATCH] Fix crash when importing a file called subs.srt.txt. --- src/lib/ffmpeg_content.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 02d7a9ff6..a3a1cfb0f 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -405,14 +405,17 @@ FFmpegContent::full_length (shared_ptr film) const return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate()); } - DCPOMATIC_ASSERT (audio); - - DCPTime longest; - BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) { - longest = max (longest, DCPTime::from_frames (llrint (i->length() / frc.speed_up), i->frame_rate())); + if (audio) { + DCPTime longest; + BOOST_FOREACH (AudioStreamPtr i, audio->streams()) { + longest = max (longest, DCPTime::from_frames(llrint(i->length() / frc.speed_up), i->frame_rate())); + } + return longest; } - return longest; + /* XXX: subtitle content? */ + + return DCPTime(); } DCPTime -- 2.30.2