diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-15 16:24:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-15 16:24:03 +0100 |
| commit | 3f2365fcf3a1ffc50901eb2e4af246aa4c83e272 (patch) | |
| tree | 289a2fdbea44d1f5d8326601972e259e65aa0d80 /src/lib/matcher.cc | |
| parent | a00ebbc68438e84076c65e99d0e70403afb4407d (diff) | |
Repair very bad merge. Mysterious.
Diffstat (limited to 'src/lib/matcher.cc')
| -rw-r--r-- | src/lib/matcher.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc index 69d12e2c4..34ddc86d6 100644 --- a/src/lib/matcher.cc +++ b/src/lib/matcher.cc @@ -29,7 +29,7 @@ using std::list; using boost::shared_ptr; Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second) - : AudioVideoProcessor (log) + : Processor (log) , _sample_rate (sample_rate) , _frames_per_second (frames_per_second) , _video_frames (0) |