diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 23:41:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 0aa823f1a0a418a5345af1907effaab51e225274 (patch) | |
| tree | e5b42849c07b511dfb1b396739dc9c215c9b6402 /src/lib | |
| parent | 3db1df492e1009ee28641cdc593a139df156e8d7 (diff) | |
Use audio length in FFmpegContent if there is no video.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index bb9795f25..32c2dee8b 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -311,7 +311,12 @@ DCPTime FFmpegContent::full_length () const { FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ()); - return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate()); + if (video) { + return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate()); + } + + DCPOMATIC_ASSERT (audio); + return DCPTime::from_frames (llrint (audio->stream()->length() / frc.speed_up), audio->stream()->frame_rate()); } void |