diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:49:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:49:54 +0100 |
| commit | 87a709a4ea5dffaadaf35ef94edb4b578eb3b56c (patch) | |
| tree | f8a5aa8e9a2e16ebe4a38b917fd5bc9654866789 /src/tools | |
| parent | ccc07eebc492d74c351c235584fd708c46b5b656 (diff) | |
| parent | 86011ad6b4ea0004a51c59b0563cf89c0947546d (diff) | |
Merge master.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/makedcp.cc | 2 | ||||
| -rw-r--r-- | src/tools/servomatictest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc index 0c6390771..c594991a6 100644 --- a/src/tools/makedcp.cc +++ b/src/tools/makedcp.cc @@ -64,7 +64,7 @@ main (int argc, char* argv[]) bool test_mode = false; bool progress = true; bool no_remote = false; - int log_level = 1; + int log_level = 0; int option_index = 0; while (1) { diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc index f5756c693..5e1cf49b4 100644 --- a/src/tools/servomatictest.cc +++ b/src/tools/servomatictest.cc @@ -47,7 +47,7 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame = 0; void -process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub) +process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub) { shared_ptr<DCPVideoFrame> local ( new DCPVideoFrame ( |