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

diff --git a/cscript b/cscript
index fa4586cdea074d92de64177b086deccca8c2c46d..d985838fc876cd742cdc3c5e87e87eed3cbde346 100644 (file)
--- a/cscript
+++ b/cscript
@@ -7,7 +7,7 @@ def dependencies(target):
         return ()
     else:
         return (('openjpeg-cdist', None),
-                ('ffmpeg-cdist', '35a110e4270b070146a84a827b10f75c5916e08a'),
+                ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'),
                 ('libdcp', 'v0.45'))
 
 def build(env, target):

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5770c5b70e5066e30b0bd0b7631a2163cd3f8b17..8508ec2a21beec19832255432e1cc118ef18550f 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -410,7 +410,7 @@ FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
        _got_frame = true;
 
        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);
@@ -420,7 +420,7 @@ FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
        int const s = floor (w);
        w -= s;
        int const f = rint (w * fps);
-       _timecode->SetLabel (wxString::Format ("%02d:%02d:%02d:%02d", h, m, s, f));
+       _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d:%02d"), h, m, s, f));
 }
 
 void