diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-30 22:33:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-30 22:33:35 +0100 |
| commit | 4e0e525106669ef350e86721f77a508d178524c8 (patch) | |
| tree | 423ce07ca6316127fd8df2a1309b94c60d0258cb /src/lib/transcode_job.cc | |
| parent | bf4273cb88539fbacd0c13f7ca30bbe48e6ad346 (diff) | |
| parent | 9b98a07cb61fd66fd73f9f58468100ec9b7eddd3 (diff) | |
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
Diffstat (limited to 'src/lib/transcode_job.cc')
| -rw-r--r-- | src/lib/transcode_job.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 356e862e0..981816fd5 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -51,6 +51,14 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film) } +TranscodeJob::~TranscodeJob () +{ + /* We have to stop the job thread here as we're about to start tearing down + the Encoder, which is bad news if the job thread is still feeding it data. + */ + stop_thread (); +} + string TranscodeJob::name () const { |