Merge master.

diff --cc src/lib/format.cc
Simple merge

diff --cc src/wx/film_editor.cc
index feb49ed78a394b392f93e118ae604fe3e2948ce9,5e597ac30bbabe06cad7e7730adc3b3994cd740d..a197a7490b4b2b7f7f36d5fa8be29fc04c36d99a
--- 1/src/wx/film_editor.cc
--- 2/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@@ -1179,12 -1265,12 +1179,12 @@@ FilmEditor::setup_audio_details (
                _audio->SetLabel (wxT (""));
        } else {
                wxString s;
 -              if (_film->audio_stream()->channels() == 1) {
 +              if (_film->audio_channels() == 1) {
                        s << _("1 channel");
                } else {
-                       s << _film->audio_channels() << " " << _("channels");
 -                      s << _film->audio_stream()->channels () << wxT (" ") << _("channels");
++                      s << _film->audio_channels() << wxT (" ") << _("channels");
                }
-               s << ", " << _film->audio_frame_rate() << _("Hz");
 -              s << wxT (", ") << _film->audio_stream()->sample_rate() << _("Hz");
++              s << wxT (", ") << _film->audio_frame_rate() << _("Hz");
                _audio->SetLabel (s);
        }
  

diff --cc wscript
Simple merge