From 95b9ed055b8a2ad0652ac2ec25f3b0bc0f1a0e19 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Oct 2018 15:15:36 +0100 Subject: [PATCH] Fix crash on exporting multi-reel to a single file (#1388). --- src/lib/ffmpeg_encoder.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 24ce22270..eb3b0c28a 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -129,7 +129,8 @@ FFmpegEncoder::go () shared_ptr deinterleaved (new AudioBuffers (_output_audio_channels, audio_frames)); for (DCPTime i; i < _film->length(); i += video_frame) { - if (!reel->contains(i)) { + if (_file_encoders.size() > 1 && !reel->contains(i)) { + /* Next reel and file */ ++reel; ++encoder; DCPOMATIC_ASSERT (reel != reel_periods.end()); -- 2.30.2