From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Oct 2018 14:15:36 +0000 (+0100)
Subject: Fix crash on exporting multi-reel to a single file (#1388).
X-Git-Tag: v2.13.64~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=95b9ed055b8a2ad0652ac2ec25f3b0bc0f1a0e19;hp=541e55115e8dfb09bb584f8176698d1db6ff826a

Fix crash on exporting multi-reel to a single file (#1388).
---

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<AudioBuffers> 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());