diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
| commit | 985a83ffbf251db481150221914ef74fbfe549b2 (patch) | |
| tree | 5de2be442f41d3117102011c4ef92e375b0f0e25 /src/lib/dcp_decoder.h | |
| parent | 8e4f48a96af091e7d90387aa027d65ac285a8201 (diff) | |
| parent | 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index d81b20b5c..89931aa38 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -31,7 +31,7 @@ class Log; class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder { public: - DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log>); + DCPDecoder (boost::shared_ptr<const DCPContent>); private: void seek (ContentTime t, bool accurate); @@ -41,6 +41,5 @@ private: ContentTime _next; std::list<boost::shared_ptr<dcp::Reel> > _reels; std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel; - boost::shared_ptr<Log> _log; boost::shared_ptr<const DCPContent> _dcp_content; }; |