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/lib/encoder.cc | |
| parent | ccc07eebc492d74c351c235584fd708c46b5b656 (diff) | |
| parent | 86011ad6b4ea0004a51c59b0563cf89c0947546d (diff) | |
Merge master.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 7b338407e..cff9899ac 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -231,7 +231,7 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub) +Encoder::process_video (shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub) { FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate()); @@ -294,7 +294,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su } void -Encoder::process_audio (shared_ptr<AudioBuffers> data) +Encoder::process_audio (shared_ptr<const AudioBuffers> data) { #if HAVE_SWRESAMPLE /* Maybe sample-rate convert */ @@ -333,7 +333,9 @@ Encoder::terminate_threads () lock.unlock (); for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) { - (*i)->join (); + if ((*i)->joinable ()) { + (*i)->join (); + } delete *i; } } |