projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c85f253
)
White space.
author
Carl Hetherington
<cth@carlh.net>
Thu, 2 Dec 2021 22:05:45 +0000
(23:05 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 3 Dec 2021 20:19:28 +0000
(21:19 +0100)
src/lib/audio_merger.cc
patch
|
blob
|
history
diff --git
a/src/lib/audio_merger.cc
b/src/lib/audio_merger.cc
index 0bc1ad008ef9339b95f28e799e6fe88677129427..a87d8619d77256c9e8684f8007d1bd9da17e26e8 100644
(file)
--- a/
src/lib/audio_merger.cc
+++ b/
src/lib/audio_merger.cc
@@
-155,7
+155,7
@@
AudioMerger::push (std::shared_ptr<const AudioBuffers> audio, DCPTime time)
} 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);
- } else if (before ==_buffers.end() && after != _buffers.end()) {
+ } else if (before ==
_buffers.end() && after != _buffers.end()) {
/* We have an existing buffer after this one; append it to the new data and replace */
part->append (after->audio);
after->audio = part;