projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bd80153
)
Fix crash when importing a file called subs.srt.txt.
author
Carl Hetherington
<cth@carlh.net>
Fri, 1 Feb 2019 19:50:59 +0000
(19:50 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 1 Feb 2019 19:50:59 +0000
(19:50 +0000)
src/lib/ffmpeg_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 02d7a9ff68cf9b85607f81f65d7251f5cef4cdb2..a3a1cfb0fd491da77b0b2ac23b6964fb75983309 100644
(file)
--- 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());
}
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
}
DCPTime