Remove Image::clone in favour of a copy constructor for SimpleImage; clean up A/B transcoder slightly; fix combiner if image strides differ; try to fix problems when destroying Encoders; fix SimpleImage copy constructor to cope with aligned images; don't call encoder::process_end if the encode throws an exception.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 7a1eea069..cff9899ac 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -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;
 	}
 }