Repair very bad merge. Mysterious.

[dcpomatic.git] / src / lib / video_decoder.h

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index f8612dff2b5140206fcef62c894768ca50b53bec..6e4fd48c0019710a2632e921d35645efa119c239 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -24,7 +24,7 @@
 #include "stream.h"
 #include "decoder.h"
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public TimedVideoSource, public virtual Decoder
 {
 public:
        VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);