projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
541e551
)
Fix crash on exporting multi-reel to a single file (#1388).
author
Carl Hetherington
<cth@carlh.net>
Sat, 20 Oct 2018 14:15:36 +0000
(15:15 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 20 Oct 2018 14:15:36 +0000
(15:15 +0100)
src/lib/ffmpeg_encoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_encoder.cc
b/src/lib/ffmpeg_encoder.cc
index 24ce22270554b19dcdac293acda4683b71853ae4..eb3b0c28a17af40f1fbb05168a2868d00fa8bc59 100644
(file)
--- 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());