diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 9 | ||||
| -rw-r--r-- | src/lib/util.cc | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 0ca374604..81c7de77f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -987,14 +987,7 @@ Film::set_content (string c) } /* Default format */ - switch (content_type()) { - case STILL: - set_format (Format::from_id ("var-185")); - break; - case VIDEO: - set_format (Format::from_id ("185")); - break; - } + set_format (Config::instance()->default_format ()); /* Still image DCPs must use external audio */ if (content_type() == STILL) { diff --git a/src/lib/util.cc b/src/lib/util.cc index f5bcdf12c..2f8be6edd 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1076,8 +1076,8 @@ LocaleGuard::LocaleGuard () if (old) { _old = strdup (old); - if (strcmp (_old, "POSIX")) { - setlocale (LC_NUMERIC, "POSIX"); + if (strcmp (_old, "C")) { + setlocale (LC_NUMERIC, "C"); } } } |