diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-01 19:50:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-01 19:50:59 +0000 |
| commit | 5c91ae09c613348a6e2f576cb0eb5cc1ee467235 (patch) | |
| tree | 2e08aeafc06bd1f183f3dda0bee7cd0dbdd449d0 /src/lib/ffmpeg_content.cc | |
| parent | bd801531b836cf8e8a3a985c4ed8660899207521 (diff) | |
Fix crash when importing a file called subs.srt.txt.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 15 |
1 files 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<const Film> 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 |