summaryrefslogtreecommitdiff
path: root/src/lib/transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-14 11:27:17 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-14 11:27:17 +0100
commit5c09a82e483593fb37da0cad20679be735887613 (patch)
tree9fb0540536514aa1dc7d4fd4c056c24ca52f59d3 /src/lib/transcoder.cc
parent8f7d0cf115980cb357bc3da410842503930e66b8 (diff)
Move Eyes and ColourConversion into PlayerVideoFrame.
Diffstat (limited to 'src/lib/transcoder.cc')
-rw-r--r--src/lib/transcoder.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index cd729fc22..b11ce8be5 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -40,11 +40,11 @@ using boost::weak_ptr;
using boost::dynamic_pointer_cast;
static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerVideoFrame> image, Eyes eyes, ColourConversion conversion, bool same)
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerVideoFrame> pvf, bool same)
{
shared_ptr<Encoder> e = encoder.lock ();
if (e) {
- e->process_video (image, eyes, conversion, same);
+ e->process_video (pvf, same);
}
}
@@ -66,7 +66,7 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
, _encoder (new Encoder (f, j))
, _finishing (false)
{
- _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
+ _player->Video.connect (bind (video_proxy, _encoder, _1, _2));
_player->Audio.connect (bind (audio_proxy, _encoder, _1));
}