diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-20 02:27:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-20 02:27:27 +0100 |
| commit | d40ebb82f62ab3d826e43e8d1187be9b768e535f (patch) | |
| tree | a34702b3ca85cdff7101825723e9827483db38f2 | |
| parent | 98499a61e17e68c438e56fd8854081a4c98b15ad (diff) | |
| parent | 45747c8dce6448cc6b6c797ae04f3e5fc3b741e8 (diff) | |
Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 5770c5b70..8508ec2a2 100644 --- 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 |