diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-27 19:03:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-27 19:03:45 +0100 |
| commit | 3d48669c9cba480cf83775cafd2a66033007c030 (patch) | |
| tree | 1f5580d0d6a85623f2a722bb4a123e162b881ee8 /src/lib/ffmpeg_decoder.h | |
| parent | 4833c6d5dd49ecd768af5edad81823baa9c094ab (diff) | |
| parent | a0498a6e13647d181153693b1f2c75cb00de92f4 (diff) | |
Merge branch 'test-fixes'
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 0c89b973d..198f4294e 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -107,6 +107,9 @@ public: private: + /* No copy construction */ + FFmpegDecoder (FFmpegDecoder const &); + bool pass (); bool do_seek (double p, bool, bool); PixelFormat pixel_format () const; @@ -145,4 +148,6 @@ private: std::list<boost::shared_ptr<FilterGraph> > _filter_graphs; boost::mutex _filter_graphs_mutex; + + static boost::mutex _mutex; }; |