X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.cc;h=294b031621b91076606bc716b273096ade261d61;hb=16d38163112bc3dddc71b9f4d6e65191395948e8;hp=d7a56f01eb95ccb311bd15c1e883c525e9e08ac5;hpb=592c7844e80a53aeb3a88edb4ffc2b68713a10e1;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index d7a56f01e..294b03162 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);
@@ -256,7 +260,8 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 	frame->width = image->size().width;
 	frame->height = image->size().height;
 	frame->format = _pixel_format;
-	frame->pts = time.seconds() / av_q2d (_video_stream->time_base);
+	DCPOMATIC_ASSERT (_video_stream->time_base.num == 1);
+	frame->pts = time.get() * _video_stream->time_base.den / DCPTime::HZ;
 
 	AVPacket packet;
 	av_init_packet (&packet);
@@ -378,7 +383,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);
 	}