diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
| commit | 9e758fddfb8bbadb1fc84e393daa815445d5e9d5 (patch) | |
| tree | 291005ebf01a66f07ab05b09e72f634ddd1ac45a /src/lib/transcoder.cc | |
| parent | 362ed9ee4f73bee21b3ef8d3b449bb8e8877f501 (diff) | |
| parent | 69c08e8bbd5028a65cbddd2aa5f10632bd059191 (diff) | |
Merge delay-decode-take2 branch into master.
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 1c8f7e3eb..b11ce8be5 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,11 +40,11 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; static void -video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerImage> 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)); } |