eebb00c092e568a14c0af3ce513d34f6b4ee834d from master; limit DCP channels and bump...

diff --git a/TO_PORT b/TO_PORT
index bb8560981c3da47d92a5a1209ac6ea3560c9b887..b1dcf52161e97db83d9d7c8b23e1af6d1a2add10 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,2 +1 @@
-0b3fb0ba4c841de950e6f62ddd3992925ca781c6
 wscript/cscript etc. cleanups

diff --git a/cscript b/cscript
index e113e71013ea0fb22421910f8be5e932daef7aac..3864fbaa1731090f3995e4a40a70c54b8a4bcc0a 100644 (file)
--- 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 82872ad8477d46f8277c450a768b8e6571350bc8..88ecf88bd75cb1f15c1bb4d789e1bfc124c63a26 100644 (file)
--- 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));