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
/
player_video.cc
diff --git
a/src/lib/player_video.cc
b/src/lib/player_video.cc
index 2feb52f42e9d2ef158a3dc1ad272079958bb1a48..8e6fcd5f3524f8baf4e00c54f791cc92bf4778a7 100644
(file)
--- a/
src/lib/player_video.cc
+++ b/
src/lib/player_video.cc
@@
-90,7
+90,7
@@
PlayerVideo::set_subtitle (PositionImage image)
}
shared_ptr<Image>
}
shared_ptr<Image>
-PlayerVideo::image (bool burn_subtitle) const
+PlayerVideo::image (
AVPixelFormat pixel_format,
bool burn_subtitle) const
{
shared_ptr<Image> im = _in->image ();
{
shared_ptr<Image> im = _in->image ();
@@
-112,7
+112,7
@@
PlayerVideo::image (bool burn_subtitle) const
break;
}
break;
}
- shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler,
PIX_FMT_RGB24
, true);
+ shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler,
pixel_format
, true);
if (burn_subtitle && _subtitle.image) {
out->alpha_blend (_subtitle.image, _subtitle.position);
if (burn_subtitle && _subtitle.image) {
out->alpha_blend (_subtitle.image, _subtitle.position);