From 3f2365fcf3a1ffc50901eb2e4af246aa4c83e272 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 Apr 2013 16:24:03 +0100
Subject: Repair very bad merge.  Mysterious.

---
 src/lib/processor.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/lib/processor.h')

diff --git a/src/lib/processor.h b/src/lib/processor.h
index 1ba396f2f..603239f8f 100644
--- a/src/lib/processor.h
+++ b/src/lib/processor.h
@@ -67,6 +67,15 @@ public:
 	{}
 };
 
+class TimedAudioVideoProcessor : public Processor, public TimedVideoSource, public TimedVideoSink, public TimedAudioSource, public TimedAudioSink
+{
+public:
+	TimedAudioVideoProcessor (boost::shared_ptr<Log> log)
+		: Processor (log)
+	{}
+};
+				
+
 /** @class AudioProcessor
  *  @brief A processor which handles just audio data.
  */
@@ -95,4 +104,12 @@ public:
 	{}
 };
 
+class TimedVideoProcessor : public Processor, public TimedVideoSource, public TimedVideoSink
+{
+public:
+	TimedVideoProcessor (boost::shared_ptr<Log> log)
+		: Processor (log)
+	{}
+};	
+
 #endif
-- 
cgit v1.2.3