X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=41b5459292f9104dc333f664401f7fcf1fdd0850;hb=895b386b6751afd3d068155f4ea71e762297672a;hp=064c72f8d6166b1beef064cf16d39bd21fb82e8e;hpb=ba8a5a15cc27988e2bbc6acd470d8532f1d8e99f;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index 064c72f8d..41b545929 100644
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,7 @@
 #include "dcpomatic_time.h"
 #include "rgba.h"
 #include "ffmpeg_stream.h"
+#include <boost/thread/mutex.hpp>
 #include <map>
 
 class FFmpegSubtitleStream : public FFmpegStream
@@ -38,5 +39,7 @@ public:
 	std::map<RGBA, RGBA> colours () const;
 
 private:
+	/** mutex to protect _colours as it can be set from the "examine FFMpeg subtitles" job thread */
+	mutable boost::mutex _mutex;
 	std::map<RGBA, RGBA> _colours;
 };