summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TO_PORT1
-rw-r--r--cscript2
-rw-r--r--src/wx/dcp_panel.cc2
3 files changed, 2 insertions, 3 deletions
diff --git a/TO_PORT b/TO_PORT
index bb8560981..b1dcf5216 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,2 +1 @@
-0b3fb0ba4c841de950e6f62ddd3992925ca781c6
wscript/cscript etc. cleanups
diff --git a/cscript b/cscript
index e113e7101..3864fbaa1 100644
--- a/cscript
+++ b/cscript
@@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug):
def dependencies(target):
return (('ffmpeg-cdist', 'f69bb08'),
- ('libdcp', 'e0906dd'),
+ ('libdcp', '8e7f9e4'),
('libsub', 'f66b11f'))
def build(target, options):
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));