summaryrefslogtreecommitdiff
path: root/src/lib/audio_merger.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-02-21 21:42:44 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit89aa9d4ba69e471949f791cdafe4ae20cea554d2 (patch)
treea8260555268d392292775a2851d8780e5612091b /src/lib/audio_merger.cc
parent7db99ef207c68910ee96a3e806c9832e8f90b219 (diff)
Various fixes to push audio vaguely in the right direction.
Diffstat (limited to 'src/lib/audio_merger.cc')
-rw-r--r--src/lib/audio_merger.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index a0d300b7f..49cdea6a3 100644
--- 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;