diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-12 19:53:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-12 19:53:09 +0100 |
| commit | 22745fd3831b94ace2ca80909fee6fae937a0d09 (patch) | |
| tree | e84ba806a164c42bda8a67411b1486639de10a01 | |
| parent | 40b121277ed3f1a572602f9e28c872ce861774b1 (diff) | |
| parent | 65f4c4a5e84921452e6b71b3df177d82bd8203fb (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/audio_content.cc | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -233,7 +233,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '62da6ba'), + ('libdcp', '599af58'), ('libsub', '067c21c')) def configure_options(target): diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 5d89719f7..909f89024 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -135,9 +135,9 @@ AudioContent::set_delay (int d) string AudioContent::technical_summary () const { - string s = "audio :"; + string s = "audio: "; BOOST_FOREACH (AudioStreamPtr i, streams ()) { - s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate()); + s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate()); } return s; |