Restore checking of 2D files that are incorrectly set as 3D.

[dcpomatic.git] / src / lib / ffmpeg_file_encoder.cc

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index cd5d473f946efb92eaf13a2840fc865b9b7ce00f..e5ea645998ab331993d0de8f83d2a669d15b1659 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -86,6 +86,8 @@ FFmpegFileEncoder::FFmpegFileEncoder (
                _audio_codec_name = "pcm_s24le";
                av_dict_set_int (&_video_options, "crf", x264_crf, 0);
                break;
+       default:
+               DCPOMATIC_ASSERT (false);
        }
 
        setup_video ();
@@ -278,7 +280,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);
@@ -422,5 +428,8 @@ FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data)
 void
 FFmpegFileEncoder::buffer_free2 (uint8_t* data)
 {
-       _pending_images.erase (data);
+       boost::mutex::scoped_lock lm (_pending_images_mutex);
+       if (_pending_images.find(data) != _pending_images.end()) {
+               _pending_images.erase (data);
+       }
 }