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/video_decoder.h | |
| parent | a00ebbc68438e84076c65e99d0e70403afb4407d (diff) | |
Repair very bad merge. Mysterious.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index f8612dff2..6e4fd48c0 100644 --- 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); |