diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-02-27 11:50:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 2c4102e14362ef445d1b97a3aa26a889c05578c2 (patch) | |
| tree | 83dbf410d410dcbdcf9751892bc66684cce20471 /src/lib/audio_merger.cc | |
| parent | 034cdbf907363091f1badc2b791f7706078dc2bc (diff) | |
Fix zero-sized buffers coming out of audio merger.
Diffstat (limited to 'src/lib/audio_merger.cc')
| -rw-r--r-- | src/lib/audio_merger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc index 5e0589bb1..10a71535b 100644 --- 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) { |