X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.cc;fp=src%2Flib%2Fffmpeg_file_encoder.cc;h=abde0c153f433a754fc77c2ac253cfe2bdac67af;hb=ba04eca99ebe17f139b2bcf3d9997c57dfeaeeb2;hp=d7a56f01eb95ccb311bd15c1e883c525e9e08ac5;hpb=04368a2e1626cdb62479d45d9eacb20173d3300a;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index d7a56f01e..abde0c153 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -244,7 +244,11 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 	AVFrame* frame = av_frame_alloc ();
 	DCPOMATIC_ASSERT (frame);
 
-	_pending_images[image->data()[0]] = image;
+	{
+		boost::mutex::scoped_lock lm (_pending_images_mutex);
+		_pending_images[image->data()[0]] = image;
+	}
+
 	for (int i = 0; i < 3; ++i) {
 		AVBufferRef* buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
 		frame->buf[i] = av_buffer_ref (buffer);
@@ -378,7 +382,7 @@ FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data)
 void
 FFmpegFileEncoder::buffer_free2 (uint8_t* data)
 {
-	/* XXX: does this need a lock to prevent cross-thread access to _pending_images? */
+	boost::mutex::scoped_lock lm (_pending_images_mutex);
 	if (_pending_images.find(data) != _pending_images.end()) {
 		_pending_images.erase (data);
 	}