From ef0aa27c671f9c34b9aad79015bcc50cb10c0fc5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 11 Jan 2013 19:20:51 +0000
Subject: Encoded data must be copied; disambiguate second lock in
 encoder_thread.

---
 src/lib/encoder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 93a364fed..f6d0cc40e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -536,7 +536,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (encoded) {
-			boost::mutex::scoped_lock lock (_writer_mutex);
+			boost::mutex::scoped_lock lock2 (_writer_mutex);
 			_write_queue.push_back (make_pair (encoded, vf->frame ()));
 			_writer_condition.notify_all ();
 		} else {
-- 
cgit v1.2.3