projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add list_to_vector().
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_subtitle_stream.h
diff --git
a/src/lib/ffmpeg_subtitle_stream.h
b/src/lib/ffmpeg_subtitle_stream.h
index 064c72f8d6166b1beef064cf16d39bd21fb82e8e..8f56d1975e5e7eb5defa7b529af64af4909fef06 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.h
+++ b/
src/lib/ffmpeg_subtitle_stream.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
7
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-21,6
+21,7
@@
#include "dcpomatic_time.h"
#include "rgba.h"
#include "ffmpeg_stream.h"
#include "dcpomatic_time.h"
#include "rgba.h"
#include "ffmpeg_stream.h"
+#include <boost/thread/mutex.hpp>
#include <map>
class FFmpegSubtitleStream : public FFmpegStream
#include <map>
class FFmpegSubtitleStream : public FFmpegStream
@@
-38,5
+39,7
@@
public:
std::map<RGBA, RGBA> colours () const;
private:
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;
};
std::map<RGBA, RGBA> _colours;
};