summaryrefslogtreecommitdiff
path: root/src/lib/encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-09-02 17:03:50 +0100
committerCarl Hetherington <cth@carlh.net>2015-09-02 17:03:50 +0100
commitb010bf3a39efe65db2251fbbf2640b2d9e539200 (patch)
tree61ac0f5144e0f4dd6c8a19e8101271ca09b76e9c /src/lib/encoder.h
parent73d54683d5e034b56e2edca968b477bb1b3a9603 (diff)
Don't share _terminate.
_terminate was being shared between enqueue() and the encoding threads so that when terminating and recreating the encoding threads any pending enqueue() was dropped (#683).
Diffstat (limited to 'src/lib/encoder.h')
-rw-r--r--src/lib/encoder.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index caadda591..76c87a9f7 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -96,7 +96,8 @@ private:
bool _right_done;
/* XXX: probably should be atomic */
- bool _terminate;
+ bool _terminate_enqueue;
+ bool _terminate_encoding;
/** Mutex for _threads */
mutable boost::mutex _threads_mutex;
std::list<boost::thread *> _threads;