diff options
| author | Philip Langdale <philipl@overt.org> | 2022-03-20 12:31:38 -0700 |
|---|---|---|
| committer | Philip Langdale <github.philipl@overt.org> | 2022-03-21 09:53:37 -0700 |
| commit | fcc81cd940dc721773a91301c60755aa11010a86 (patch) | |
| tree | 5c2579f59ca337fc91e3ccec0b0ec542933ad21d /video/out/vo_gpu.c | |
| parent | f871294204529374dd3056f7b616381400233036 (diff) | |
| download | mpv-fcc81cd940dc721773a91301c60755aa11010a86.tar.bz2 mpv-fcc81cd940dc721773a91301c60755aa11010a86.tar.xz | |
vo_gpu[_next]: hwdec: fix logging regression when probing
When I introduced the concept of lazy loading of hwdecs by img format,
I did not propagate the probing flag correctly, leading to the new
normal loading path not runnng with probing set, meaning that any
errors would show up, creating unnecessary noise.
This change fixes this regression.
Diffstat (limited to 'video/out/vo_gpu.c')
| -rw-r--r-- | video/out/vo_gpu.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/video/out/vo_gpu.c b/video/out/vo_gpu.c index 1f471815f1..404b7e77d7 100644 --- a/video/out/vo_gpu.c +++ b/video/out/vo_gpu.c @@ -52,7 +52,6 @@ struct gpu_priv { int events; }; - static void resize(struct vo *vo) { struct gpu_priv *p = vo->priv; @@ -129,16 +128,15 @@ static int reconfig(struct vo *vo, struct mp_image_params *params) static void request_hwdec_api(struct vo *vo, void *data) { struct gpu_priv *p = vo->priv; - int imgfmt = (intptr_t)data; - - gl_video_load_hwdecs_for_img_fmt(p->renderer, vo->hwdec_devs, imgfmt); + gl_video_load_hwdecs_for_img_fmt(p->renderer, vo->hwdec_devs, data); } -static void call_request_hwdec_api(void *ctx, int imgfmt) +static void call_request_hwdec_api(void *ctx, + struct hwdec_imgfmt_request *params) { // Roundabout way to run hwdec loading on the VO thread. // Redirects to request_hwdec_api(). - vo_control(ctx, VOCTRL_LOAD_HWDEC_API, (void *)(intptr_t)imgfmt); + vo_control(ctx, VOCTRL_LOAD_HWDEC_API, params); } static void get_and_update_icc_profile(struct gpu_priv *p) |