X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_merger.cc;h=c1d5a54dd88e4c713785cdf786aff7f60a227fc3;hb=3e20b106388c0ba4a291cb15968a10c6fbd5b367;hp=3c753553ca848dde7af1838d3bf337d769ff8fba;hpb=16d38163112bc3dddc71b9f4d6e65191395948e8;p=dcpomatic.git

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);