diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-28 09:47:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-28 09:47:55 +0100 |
| commit | 318d819afd66b76e3ea7ce728452c2fb668c0b80 (patch) | |
| tree | f053fd342a84555b98d78eca79b93cf254c028d9 /src/lib/ffmpeg_decoder.h | |
| parent | 409db67a7e665c562b4c46035e6394263a93a7f6 (diff) | |
| parent | 1c86e1eaa1115015e7b2c4129a3b4be024939db2 (diff) | |
Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
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; }; |