GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 07:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

vo_opengl_cb: hwdec_ios: fix build

Browse Source 
[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.
This commit is contained in:
Aman Gupta
2017-09-22 05:03:52 +02:00
committed by wm4
parent 52789d6ca0
commit 6254b6d637
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/opengl/hwdec_ios.m
+5 -3
View File
@@ -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, &params,
p->gl_planes[i]);
mapper->tex[i] = ra_create_wrapped_tex(
mapper->ra,
&params,
CVOpenGLESTextureGetName(p->gl_planes[i])
);
if (!mapper->tex[i])
return -1;
}