diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:41:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:41:02 +0100 |
| commit | f861018389acd9d277fe34d7621182b9b54f977f (patch) | |
| tree | 499bae7640ce99a13c31ea9c870d426084480aec /src/tools | |
| parent | f09c6b53f155de601900afa90045059b20310c0d (diff) | |
| parent | 86011ad6b4ea0004a51c59b0563cf89c0947546d (diff) | |
Merge master; fix crash on new film.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 2 | ||||
| -rw-r--r-- | src/tools/po/es_ES.po | 2 | ||||
| -rw-r--r-- | src/tools/po/fr_FR.po | 2 | ||||
| -rw-r--r-- | src/tools/po/it_IT.po | 2 | ||||
| -rw-r--r-- | src/tools/po/sv_SE.po | 2 | ||||
| -rw-r--r-- | src/tools/servomatictest.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index e2e1874c4..86c3cf4b1 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.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/po/es_ES.po b/src/tools/po/es_ES.po index d35f104c6..346aa2b39 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-09 11:14+0100\n" +"POT-Creation-Date: 2013-04-22 15:06+0100\n" "PO-Revision-Date: 2013-03-23 21:08-0500\n" "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n" "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index ef2246992..8ce305ccf 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-09 11:14+0100\n" +"POT-Creation-Date: 2013-04-22 15:06+0100\n" "PO-Revision-Date: 2013-03-13 22:33+0100\n" "Last-Translator: \n" "Language-Team: \n" diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 998f70059..13732129b 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-09 11:14+0100\n" +"POT-Creation-Date: 2013-04-22 15:06+0100\n" "PO-Revision-Date: 2013-04-03 13:00+0100\n" "Last-Translator: Maci <macibro@gmail.com>\n" "Language-Team: \n" diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index 4765c2d98..69706d647 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-09 11:14+0100\n" +"POT-Creation-Date: 2013-04-22 15:06+0100\n" "PO-Revision-Date: 2013-04-09 10:12+0100\n" "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n" "Language-Team: \n" diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc index 42cc76871..af176ac18 100644 --- a/src/tools/servomatictest.cc +++ b/src/tools/servomatictest.cc @@ -46,7 +46,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 ( |