summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-10 00:35:02 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-10 00:35:02 +0100
commit773a9e0518f86b09cd1df81cef969a654c4018cf (patch)
tree6957a042ffe204ceea38d7a72837083dce894a0c /src
parent4fd7145e6c30e2a58c179f7f018a761a4078c0d5 (diff)
eebb00c092e568a14c0af3ce513d34f6b4ee834d from master; limit DCP channels and bump libdcp.
Diffstat (limited to 'src')
-rw-r--r--src/wx/dcp_panel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 82872ad84..88ecf88bd 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -636,7 +636,7 @@ DCPPanel::make_audio_panel ()
int r = 0;
add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
_audio_channels = new wxChoice (panel, wxID_ANY);
- for (int i = 2; i <= 16; i += 2) {
+ for (int i = 2; i <= 12; i += 2) {
_audio_channels->Append (wxString::Format ("%d", i));
}
grid->Add (_audio_channels, wxGBPosition (r, 1));