projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index 73af11c55d2889412b232f80656cf2a72aa4e6ed..7863859deb817d3c66f364afb3613c5175108a65 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-217,7
+217,7
@@
Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversi
TIMING ("adding to queue of %1", _queue.size ());
_queue.push_back (shared_ptr<DCPVideoFrame> (
new DCPVideoFrame (
TIMING ("adding to queue of %1", _queue.size ());
_queue.push_back (shared_ptr<DCPVideoFrame> (
new DCPVideoFrame (
- image->image(), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
+ image->image(
PIX_FMT_RGB24, false
), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
_film->j2k_bandwidth(), _film->resolution(), _film->log()
)
));
_film->j2k_bandwidth(), _film->resolution(), _film->log()
)
));