diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-27 23:19:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-27 23:19:52 +0000 |
| commit | b86b15391074a68149f8c4a51958c7873d74def0 (patch) | |
| tree | a2303ff85e0fe4e505c6f00bd9145654a8a830d7 /src/lib | |
| parent | f42ed7e6b5d039694d8bf8a02003d0091cbc34b0 (diff) | |
Fix crash with sub-sample push parts in AudioMerger.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_merger.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc index 3c753553c..c1d5a54dd 100644 --- a/src/lib/audio_merger.cc +++ b/src/lib/audio_merger.cc @@ -147,9 +147,10 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time) part->copy_from (audio.get(), part->frames(), frames(DCPTime(i.from - time)), 0); if (before == _buffers.end() && after == _buffers.end()) { - /* New buffer */ - DCPOMATIC_ASSERT (part->frames() > 0); - _buffers.push_back (Buffer (part, time, _frame_rate)); + if (part->frames() > 0) { + /* New buffer */ + _buffers.push_back (Buffer (part, time, _frame_rate)); + } } else if (before != _buffers.end() && after == _buffers.end()) { /* We have an existing buffer before this one; append new data to it */ before->audio->append (part); |