diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-15 15:00:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-15 15:00:35 +0100 |
| commit | a00ebbc68438e84076c65e99d0e70403afb4407d (patch) | |
| tree | 6ee2f535eeb6b592c740e117d1f8f8657d6bcce8 /src/lib/matcher.cc | |
| parent | 665bc942f86bd7a8aeb2b38f3e9c2cb6662e6edc (diff) | |
| parent | 606b3f759238aa6c0d12de064b301bf36b428220 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/matcher.cc')
| -rw-r--r-- | src/lib/matcher.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc index a74eeabbb..69d12e2c4 100644 --- a/src/lib/matcher.cc +++ b/src/lib/matcher.cc @@ -28,8 +28,8 @@ using std::cout; using std::list; using boost::shared_ptr; -Matcher::Matcher (Log* log, int sample_rate, float frames_per_second) - : Processor (log) +Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second) + : AudioVideoProcessor (log) , _sample_rate (sample_rate) , _frames_per_second (frames_per_second) , _video_frames (0) |