diff options
| author | Aman Gupta <aman@tmm1.net> | 2017-09-21 19:53:52 -0700 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-09-22 05:03:52 +0200 |
| commit | 6254b6d63776ec123453f52c373fa7af5abbdbfb (patch) | |
| tree | bc2bae50efbe32b940ca481f9bf66138ca423441 /video | |
| parent | 52789d6ca002eb22cf64876ec2a05ef86b24468a (diff) | |
| download | mpv-6254b6d63776ec123453f52c373fa7af5abbdbfb.tar.bz2 mpv-6254b6d63776ec123453f52c373fa7af5abbdbfb.tar.xz | |
vo_opengl_cb: hwdec_ios: fix build
[179/188] Compiling video/out/vo_lavc.c
../../video/out/opengl/hwdec_ios.m:135:9: warning: unused variable 'gl' [-Wunused-variable]
GL *gl = ra_gl_get(mapper->ra);
^
../../video/out/opengl/hwdec_ios.m:247:48: warning: incompatible pointer to integer conversion passing 'CVOpenGLESTextureRef' (aka 'struct __CVBuffer *') to parameter of type 'GLuint' (aka 'unsigned int') [-Wint-conversion]
p->gl_planes[i]);
^~~~~~~~~~~~~~~
../../video/out/opengl/ra_gl.h:9:45: note: passing argument to parameter 'gl_texture' here
GLuint gl_texture);
^
2 warnings generated.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/opengl/hwdec_ios.m | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/video/out/opengl/hwdec_ios.m b/video/out/opengl/hwdec_ios.m index 71b205b583..8c353bf46f 100644 --- a/video/out/opengl/hwdec_ios.m +++ b/video/out/opengl/hwdec_ios.m @@ -132,7 +132,6 @@ static const struct ra_format *find_la_variant(struct ra *ra, static int mapper_init(struct ra_hwdec_mapper *mapper) { struct priv *p = mapper->priv; - GL *gl = ra_gl_get(mapper->ra); mapper->dst_params = mapper->src_params; mapper->dst_params.imgfmt = mapper->src_params.hw_subfmt; @@ -243,8 +242,11 @@ static int mapper_map(struct ra_hwdec_mapper *mapper) .src_linear = true, }; - mapper->tex[i] = ra_create_wrapped_tex(mapper->ra, ¶ms, - p->gl_planes[i]); + mapper->tex[i] = ra_create_wrapped_tex( + mapper->ra, + ¶ms, + CVOpenGLESTextureGetName(p->gl_planes[i]) + ); if (!mapper->tex[i]) return -1; } |