Try to fix crash with still-image DCPs.

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a10789e11f69394e642f61c4a6e0ef41d35e53c6..4d3f29e83010b13ef39100f1f5f6c9cc3bb327c4 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -66,7 +66,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<
        int const trim_start = f->trim_type() == Film::ENCODE ? f->trim_start() : 0;
        int const trim_end = f->trim_type() == Film::ENCODE ? f->trim_end() : 0;
        _trimmer.reset (new Trimmer (
-                               f->log(), trim_start, trim_end, f->length().get(),
+                               f->log(), trim_start, trim_end, f->length().get_value_or(0),
                                sr, f->source_frame_rate(), f->dcp_frame_rate()
                                ));
 

diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc
index 0746b74108d884cb2233924801f693e4614cbb50..b7afc9299452708e6a3f4d96e44a6dc070199225 100644 (file)
--- a/src/lib/trimmer.cc
+++ b/src/lib/trimmer.cc
@@ -28,7 +28,8 @@ using boost::shared_ptr;
 Trimmer::Trimmer (
        shared_ptr<Log> log,
        int video_trim_start,
-       int video_trim_end, int video_length,
+       int video_trim_end,
+       int video_length,
        int audio_sample_rate,
        float frames_per_second,
        int dcp_frames_per_second