summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-01-26 11:32:09 +0100
committerwm4 <wm4@nowhere>2017-01-26 11:32:09 +0100
commitbdbb3142ec4046f35265b8ca19c701b9b2f4fefa (patch)
treeee938fff6174723d3bec74ddc09626cc81e3422b
parentd303ebd9b6d46be4681b47043fda102811a36239 (diff)
downloadmpv-bdbb3142ec4046f35265b8ca19c701b9b2f4fefa.tar.bz2
mpv-bdbb3142ec4046f35265b8ca19c701b9b2f4fefa.tar.xz
client API: adjust opengl_cb hardware decoding comments
Replace the reprecated --hwdec-preload option. Add a comment about cuvid/cuda decoding.
-rw-r--r--libmpv/opengl_cb.h9
1 files changed, 6 insertions, 3 deletions
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