summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-10-20 15:15:36 +0100
committerCarl Hetherington <cth@carlh.net>2018-10-20 15:15:36 +0100
commit95b9ed055b8a2ad0652ac2ec25f3b0bc0f1a0e19 (patch)
treecbc3c2b6598ba272313d35199ef471c68e60f77d
parent541e55115e8dfb09bb584f8176698d1db6ff826a (diff)
Fix crash on exporting multi-reel to a single file (#1388).
-rw-r--r--src/lib/ffmpeg_encoder.cc3
1 files changed, 2 insertions, 1 deletions
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());