diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-22 00:18:32 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-08-12 17:16:07 +0200 |
| commit | 9b73c143ce568bd8694e3a50f2fefc1ee3a03515 (patch) | |
| tree | b6774c68129ccc687c34a8271fa5e1361b93d3d0 /src/wx | |
| parent | 0114987c5d6040d8fe07a719d7f97b0a5e200458 (diff) | |
Replace AVPixelFormat parameter to PlayerVideo::image with a functor.
This was removed in df9b4676aba8b941f124b174393988cad21677e1 and
surrounding commits, but it turns out we need it after all.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/gl_video_view.cc | 2 | ||||
| -rw-r--r-- | src/wx/simple_video_view.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index d1107f94f..cc4315019 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -645,7 +645,7 @@ GLVideoView::set_image(shared_ptr<const PlayerVideo> pv) video = pv->raw_image(); break; case Optimisation::NONE: - video = pv->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true); + video = pv->image(force(AV_PIX_FMT_RGB24), VideoRange::FULL, true); break; } diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index ff16b6146..0fd162196 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -252,7 +252,7 @@ SimpleVideoView::update () _state_timer.set ("get image"); auto const pv = player_video(); - _image = pv.first->image(AV_PIX_FMT_RGB24, VideoRange::FULL, true); + _image = pv.first->image(force(AV_PIX_FMT_RGB24), VideoRange::FULL, true); if (pv.first->colour_conversion() && pv.first->colour_conversion()->about_equal(dcp::ColourConversion::rec2020_to_xyz(), 1e-6)) { _image = Image::ensure_alignment(_rec2020_filter_graph.get(_image->size(), _image->pixel_format())->process(_image).front(), Image::Alignment::COMPACT); } |