diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-19 23:50:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-19 23:50:17 +0000 |
| commit | 2f56f38ce56b36f20d59593f56981e7ed330c484 (patch) | |
| tree | 1889f6eff9545010815775671df54064bc796201 /src/lib/combiner.cc | |
| parent | 13337c62d8c0d052ba0377af9c00fe1d940be3cc (diff) | |
Re-work again so that there's just one encoder; various tweaks to still-image-with-audio.
Diffstat (limited to 'src/lib/combiner.cc')
| -rw-r--r-- | src/lib/combiner.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc index b85dbf288..d5f55026b 100644 --- a/src/lib/combiner.cc +++ b/src/lib/combiner.cc @@ -33,7 +33,7 @@ Combiner::Combiner (Log* log) * @param sub Subtitle (which will be ignored) */ void -Combiner::process_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub) +Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub) { _image = image; } @@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub) * @param sub Subtitle (which will be put onto the whole frame) */ void -Combiner::process_video_b (shared_ptr<Image> image, shared_ptr<Subtitle> sub) +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, shared_ptr<Subtitle> sub) } } - Video (_image, sub); + Video (_image, false, sub); _image.reset (); } |