diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-26 01:03:00 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-26 01:03:00 +0200 |
| commit | 04368a2e1626cdb62479d45d9eacb20173d3300a (patch) | |
| tree | 29b06ebfa4c0d81d322af153ec96538cea437435 | |
| parent | 6b7e2cd427d07f1a0ba837ddf7e1b272fef2839b (diff) | |
| parent | 592c7844e80a53aeb3a88edb4ffc2b68713a10e1 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomaticv2.14.12
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index 5eccb8f17..d7a56f01e 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -378,5 +378,8 @@ FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data) void FFmpegFileEncoder::buffer_free2 (uint8_t* data) { - _pending_images.erase (data); + /* XXX: does this need a lock to prevent cross-thread access to _pending_images? */ + if (_pending_images.find(data) != _pending_images.end()) { + _pending_images.erase (data); + } } |