summaryrefslogtreecommitdiff
path: root/src/lib/imagemagick_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-05 10:36:55 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-05 10:36:55 +0000
commitca4d051ceafb77c281583c4e50b391f230544313 (patch)
treef3bb8a080dd87feae70ed90cb93d99e4bdd7e4a2 /src/lib/imagemagick_encoder.cc
parent10a001a0c7cf33d384d9613168d80c0c5a07426c (diff)
Move trimming into the encoder; seems to be cleaner.
Diffstat (limited to 'src/lib/imagemagick_encoder.cc')
-rw-r--r--src/lib/imagemagick_encoder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc
index e0e2d1cdc..6c70e3749 100644
--- a/src/lib/imagemagick_encoder.cc
+++ b/src/lib/imagemagick_encoder.cc
@@ -50,7 +50,7 @@ ImageMagickEncoder::ImageMagickEncoder (shared_ptr<const Film> f, shared_ptr<con
}
void
-ImageMagickEncoder::process_video (shared_ptr<const Image> image, SourceFrame frame, shared_ptr<Subtitle> sub)
+ImageMagickEncoder::do_process_video (shared_ptr<const Image> image, SourceFrame frame, shared_ptr<Subtitle> sub)
{
shared_ptr<Image> scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _film->scaler());
shared_ptr<Image> compact (new CompactImage (scaled));