From 2f56f38ce56b36f20d59593f56981e7ed330c484 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Dec 2012 23:50:17 +0000 Subject: Re-work again so that there's just one encoder; various tweaks to still-image-with-audio. --- src/lib/combiner.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/combiner.cc') 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, shared_ptr sub) +Combiner::process_video (shared_ptr image, bool, shared_ptr sub) { _image = image; } @@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr image, shared_ptr sub) * @param sub Subtitle (which will be put onto the whole frame) */ void -Combiner::process_video_b (shared_ptr image, shared_ptr sub) +Combiner::process_video_b (shared_ptr image, bool, shared_ptr 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, shared_ptr sub) } } - Video (_image, sub); + Video (_image, false, sub); _image.reset (); } -- cgit v1.2.3