diff options
Diffstat (limited to 'libmpv')
| -rw-r--r-- | libmpv/client.h | 3 | ||||
| -rw-r--r-- | libmpv/opengl_cb.h | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libmpv/client.h b/libmpv/client.h index 51f5c24d59..14777b429a 100644 --- a/libmpv/client.h +++ b/libmpv/client.h @@ -864,8 +864,7 @@ int mpv_command(mpv_handle *ctx, const char **args); * function succeeds, this is set to command-specific return * data. You must call mpv_free_node_contents() to free it * (again, only if the command actually succeeds). - * Currently, no command uses this, but that can change in - * the future. + * Not many commands actually use this at all. * @return error code (the result parameter is not set on error) */ int mpv_command_node(mpv_handle *ctx, mpv_node *args, mpv_node *result); diff --git a/libmpv/opengl_cb.h b/libmpv/opengl_cb.h index 6500b4ef65..0c14f0f2de 100644 --- a/libmpv/opengl_cb.h +++ b/libmpv/opengl_cb.h @@ -117,14 +117,17 @@ extern "C" { * * While "normal" mpv loads the OpenGL hardware decoding interop on demand, * this can't be done with opengl_cb for internal technical reasons. Instead, - * make it load the interop at load time by setting the "hwdec-preload"="auto" - * option before calling mpv_opengl_cb_init_gl(). + * make it load the interop at load time by setting the + * "opengl-hwdec-interop"="auto" option before calling mpv_opengl_cb_init_gl() + * ("hwdec-preload" in older mpv releases). * * There may be certain requirements on the OpenGL implementation: * - Windows: ANGLE is required (although in theory GL/DX interop could be used) * - Intel/Linux: EGL is required, and also a glMPGetNativeDisplay() callback * must be provided (see sections below) - * - nVidia/Linux: GLX is required + * - nVidia/Linux: GLX is required (if you force "cuda", it should work on EGL + * as well, if you have recent enough drivers and the + * "hwaccel" option is set to "cuda" as well) * - OSX: CGL is required (CGLGetCurrentContext() returning non-NULL) * * Once these things are setup, hardware decoding can be enabled/disabled at |