Merge master.

[dcpomatic.git] / src / tools / dcpomatic_create.cc

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 05121652aa7148312affcf820a189d978d9cf08c..4f737dd5a53eafbefa0dd2d2d030fb9e6e03377e 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -155,7 +155,7 @@ main (int argc, char* argv[])
                        shared_ptr<Content> c = content_factory (film, argv[i]);
                        shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c);
                        if (vc) {
-                               vc->set_ratio (content_ratio);
+                               vc->set_scale (VideoContentScale (content_ratio));
                        }
                        film->examine_and_add_content (c);
                }
@@ -179,7 +179,7 @@ main (int argc, char* argv[])
                if (!output.empty ()) {
                        film->write_metadata ();
                } else {
-                       film->metadata()->write_to_stream_formatted (cout);
+                       film->metadata()->write_to_stream_formatted (cout, "UTF-8");
                }
        } catch (exception& e) {
                cerr << argv[0] << ": " << e.what() << "\n";