diff options
| author | wm4 <wm4@nowhere> | 2015-06-20 22:26:57 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-20 22:26:57 +0200 |
| commit | 991af7dfb10c514a10d84f5a3e2698e646eb53d4 (patch) | |
| tree | 03816e23f1b58bad4b6ca0249006d953096acd0a /video/vdpau.h | |
| parent | b17b8ff7fe91be294ffb229c0c143da7a6425fca (diff) | |
| download | mpv-991af7dfb10c514a10d84f5a3e2698e646eb53d4.tar.bz2 mpv-991af7dfb10c514a10d84f5a3e2698e646eb53d4.tar.xz | |
video: reduce error message when loading hwdec backend fails
When using --hwdec=auto, about half of all systems will print:
"[vdpau] Error when calling vdp_device_create_x11: 1"
this happens because usually mpv will be linked against both vdpau and
vaapi libs, but the drivers are not necessarily available. Then trying
to load a driver will fail. This is a normal part of probing, but the
error messages were printed anyway. Silence them by explicitly
distinguishing probing.
This pretty much goes through all the layers. We actually consider
loading hw backends for vo_opengl always "auto probed", even if a hw
backend is explicitly requested. In this case vd_lavc will print a
warning message anyway (adjust this message a bit).
Diffstat (limited to 'video/vdpau.h')
| -rw-r--r-- | video/vdpau.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video/vdpau.h b/video/vdpau.h index 2304ecd0d6..2e9269a420 100644 --- a/video/vdpau.h +++ b/video/vdpau.h @@ -79,7 +79,8 @@ struct mp_vdpau_ctx { int getimg_w, getimg_h; }; -struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, Display *x11); +struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, Display *x11, + bool probing); void mp_vdpau_destroy(struct mp_vdpau_ctx *ctx); int mp_vdpau_handle_preemption(struct mp_vdpau_ctx *ctx, uint64_t *counter); |