diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
| commit | cfdd68eb5fb0ef8423e860103ad4e5510994f1da (patch) | |
| tree | 9ea43b250723775329741e59d5bc2dd861bcb7be /src/lib/util.cc | |
| parent | 1dcfb3a26085ebb3703f40e2f51e43ce3d98be50 (diff) | |
| parent | 5575a950f13dbed1e60d733aee71b316c3429ae0 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 45d5a757c..0eb14845d 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -737,7 +737,7 @@ ensure_ui_thread () string audio_channel_name (int c) { - assert (MAX_AUDIO_CHANNELS == 12); + assert (MAX_DCP_AUDIO_CHANNELS == 12); /* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency enhancement channel (sub-woofer). HI is the hearing-impaired audio track and |