projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index 826cba4fc61aa8755b7665dff5b97ee705166e04..1c8f7e3eb0b021d03f6c62a0076ce4cd41f56188 100644
(file)
--- a/
src/lib/transcoder.cc
+++ b/
src/lib/transcoder.cc
@@
-40,7
+40,7
@@
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
static void
using boost::dynamic_pointer_cast;
static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<
const
Image> image, Eyes eyes, ColourConversion conversion, bool same)
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<
Player
Image> image, Eyes eyes, ColourConversion conversion, bool same)
{
shared_ptr<Encoder> e = encoder.lock ();
if (e) {
{
shared_ptr<Encoder> e = encoder.lock ();
if (e) {