summaryrefslogtreecommitdiff
path: root/src/lib/encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-15 16:36:28 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-15 16:36:28 +0000
commit4e5d5c7dcc6470b8dc918d03a00e30c07df60efe (patch)
treec167419e927f260348b468aae5036815a6a640a5 /src/lib/encoder.cc
parente8204f55c981493b99814f71a50b3c3d62601032 (diff)
parentf71a23109d774dc65e4262e5dba41360732cf342 (diff)
Merge master.
Diffstat (limited to 'src/lib/encoder.cc')
-rw-r--r--src/lib/encoder.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ca9134c04..d26f77614 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -68,9 +68,6 @@ Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j)
Encoder::~Encoder ()
{
terminate_threads ();
- if (_writer) {
- _writer->finish ();
- }
}
/** Add a worker thread for a each thread on a remote server. Caller must hold