diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-11 19:20:51 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-11 19:20:51 +0000 |
| commit | ef0aa27c671f9c34b9aad79015bcc50cb10c0fc5 (patch) | |
| tree | 7216d311005a1469f079006cbb17f734a21a91ea /src/lib/encoder.cc | |
| parent | d0babb26ab341026fe227de810ed30c6c9f65cf2 (diff) | |
Encoded data must be copied; disambiguate second lock in encoder_thread.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |