projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Various fixes to push audio vaguely in the right direction.
[dcpomatic.git]
/
src
/
lib
/
audio_merger.cc
diff --git
a/src/lib/audio_merger.cc
b/src/lib/audio_merger.cc
index a0d300b7f8b52ae6550313ec7d1d34e5f3942912..49cdea6a354ebe6c4c4b45503c3122795d2e1198 100644
(file)
--- a/
src/lib/audio_merger.cc
+++ b/
src/lib/audio_merger.cc
@@
-19,6
+19,7
@@
#include "audio_merger.h"
#include "dcpomatic_time.h"
+#include <iostream>
using std::pair;
using std::min;