diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-21 19:14:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-21 19:14:58 +0100 |
| commit | cb990adba9c57e5107ef2aa9716cf0a26c1df83d (patch) | |
| tree | e59571d05db47b6f1070c85331ba351fd2794adf /src/lib/player_video.cc | |
| parent | 8a19e2b56d3b95a18ae8ac9965eab750c28d30ad (diff) | |
| parent | 5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/player_video.cc')
| -rw-r--r-- | src/lib/player_video.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 2feb52f42..8e6fcd5f3 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -90,7 +90,7 @@ PlayerVideo::set_subtitle (PositionImage 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 (); @@ -112,7 +112,7 @@ PlayerVideo::image (bool burn_subtitle) const 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); |