diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-31 14:19:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-31 14:19:50 +0100 |
| commit | f385ef03e5ea27519a31c0839447735a7fba0602 (patch) | |
| tree | 310902e785a95c2e3be1ba389f29cd7bd480f2a2 /src/lib/combiner.h | |
| parent | c13771610ef9a01cb29342bca82f9999f8b5ddbc (diff) | |
Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.
Diffstat (limited to 'src/lib/combiner.h')
| -rw-r--r-- | src/lib/combiner.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/combiner.h b/src/lib/combiner.h index 1b7537d42..46c90b4d8 100644 --- a/src/lib/combiner.h +++ b/src/lib/combiner.h @@ -34,8 +34,8 @@ class Combiner : public VideoSource, public VideoSink public: Combiner (); - void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time); - void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time); + void process_video (boost::shared_ptr<const Image> i, bool, Time); + void process_video_b (boost::shared_ptr<const Image> i, bool, Time); private: /** The image that we are currently working on */ |