projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix zero-sized buffers coming out of audio merger.
[dcpomatic.git]
/
src
/
lib
/
audio_merger.cc
diff --git
a/src/lib/audio_merger.cc
b/src/lib/audio_merger.cc
index 5e0589bb12941e39481e74ac104700ab7a711ce7..10a71535b4794e7e80cebe792898d5deab03ed17 100644
(file)
--- a/
src/lib/audio_merger.cc
+++ b/
src/lib/audio_merger.cc
@@
-51,7
+51,7
@@
AudioMerger::pull (DCPTime time)
list<Buffer> new_buffers;
BOOST_FOREACH (Buffer i, _buffers) {
- if (i.period().to < time) {
+ if (i.period().to <
=
time) {
/* Completely within the pull period */
out.push_back (make_pair (i.audio, i.time));
} else if (i.time < time) {