Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging

diff --cc src/wx/film_viewer.cc
index 5770c5b70e5066e30b0bd0b7631a2163cd3f8b17,fe2025b780635f7c515f25e5903b3a7e43acaac8..8508ec2a21beec19832255432e1cc118ef18550f
--- 1/src/wx/film_viewer.cc
--- 2/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@@ -409,8 -401,9 +409,8 @@@ FilmViewer::process_video (shared_ptr<I
  
        _got_frame = true;
  
 -      double const t = _decoders.video->last_source_time ();
        double const fps = _decoders.video->frames_per_second ();
-       _frame->SetLabel (wxString::Format ("%d", int (rint (t * fps))));
+       _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps))));
  
        double w = t;
        int const h = (w / 3600);