diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-06 00:51:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-06 00:51:44 +0000 |
| commit | 422341d1cb6bc8cbb6be76eac239c40cb4061c79 (patch) | |
| tree | 1a4193e699024bd53f5ef2da5d9958aa74ffbd06 /src/lib/combiner.cc | |
| parent | 18614dda0d53b713ace5ad1df57298d049dba87f (diff) | |
Revert "Split timed from untimed sinks / sources. Should produce same output, in theory."
This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.
Diffstat (limited to 'src/lib/combiner.cc')
| -rw-r--r-- | src/lib/combiner.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc index e628f3a84..68aafd2a2 100644 --- a/src/lib/combiner.cc +++ b/src/lib/combiner.cc @@ -23,7 +23,7 @@ using boost::shared_ptr; Combiner::Combiner (Log* log) - : Processor (log) + : VideoProcessor (log) { } @@ -33,7 +33,7 @@ Combiner::Combiner (Log* log) * @param image Frame image. */ void -Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double) +Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>) { _image = image; } @@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, do * @param sub Subtitle (which will be put onto the whole frame) */ void -Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub, double t) +Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub) { /* Copy the right half of this image into our _image */ /* XXX: this should probably be in the Image class */ @@ -62,6 +62,6 @@ Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s } } - Video (_image, false, sub, t); + Video (_image, false, sub); _image.reset (); } |