diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-28 23:26:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-28 23:26:00 +0100 |
| commit | ec97893127a2d59871d92c9e658b6b1ab3100b40 (patch) | |
| tree | 47151780708e655460c0742703edc987114de988 | |
| parent | 7962e6cfd5fbd97e1e44aebe3fc190c62da027e9 (diff) | |
| parent | c688d6a6e28f22a01316f67875f30db3d029affb (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | hacks/pixfmts.c | 6 | ||||
| -rw-r--r-- | src/lib/job.cc | 4 |
3 files changed, 9 insertions, 5 deletions
@@ -328,8 +328,8 @@ def dependencies(target): else: deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)] - deps.append(('libdcp', '9f75a44')) - deps.append(('libsub', '920b428')) + deps.append(('libdcp', '90aa785')) + deps.append(('libsub', 'd24512e')) deps.append(('rtaudio-cdist', '739969e')) return deps diff --git a/hacks/pixfmts.c b/hacks/pixfmts.c index e1dd00a9d..3aa593d09 100644 --- a/hacks/pixfmts.c +++ b/hacks/pixfmts.c @@ -12,4 +12,10 @@ int main() SHOW(AV_PIX_FMT_YUV420P16LE); SHOW(AV_PIX_FMT_YUV422P10LE); SHOW(AV_PIX_FMT_YUV444P9BE); + SHOW(AV_PIX_FMT_YUV420P9LE); + SHOW(AV_PIX_FMT_YUV420P10BE); + SHOW(AV_PIX_FMT_YUV420P10LE); + SHOW(AV_PIX_FMT_YUV422P10BE); + SHOW(AV_PIX_FMT_YUV422P9LE); + SHOW(AV_PIX_FMT_GBRP); } diff --git a/src/lib/job.cc b/src/lib/job.cc index 0cbf13640..7539a5070 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -176,7 +176,7 @@ Job::run_wrapper () } catch (dcp::DCPReadError& e) { - set_error (e.what(), "");//message(), e.detail().get_value_or("")); + set_error (e.message(), e.detail().get_value_or("")); set_progress (1); set_state (FINISHED_ERROR); @@ -399,8 +399,6 @@ void Job::set_error (string s, string d) { if (_film) { - LOG_ERROR_NC (s); - LOG_ERROR_NC (d); _film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), LogEntry::TYPE_ERROR); } |