From 1f6e71c7faed4b44ec2c50519f8c1f6734d81eea Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 10 May 2016 21:11:58 +0200 Subject: vo_opengl: fix passing along swizzle from hwdec interop In theory this was needed for the previous commit (but wasn't in practice, since for hwdec the LUMINANCE_ALPHA mangling is not applied anymore, and ANGLE uses RG textures in absence of GL_ARB_texture_rg for whatever crazy reasons). In practice this caused funky colors on OSX with the uyvy422 format, which is also fixed in this commit. --- video/out/opengl/hwdec_osx.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'video/out/opengl/hwdec_osx.c') diff --git a/video/out/opengl/hwdec_osx.c b/video/out/opengl/hwdec_osx.c index 2c1ffc71ae..6ddfa66e0a 100644 --- a/video/out/opengl/hwdec_osx.c +++ b/video/out/opengl/hwdec_osx.c @@ -246,6 +246,8 @@ static int map_frame(struct gl_hwdec *hw, struct mp_image *hw_image, .tex_w = IOSurfaceGetWidthOfPlane(surface, i), .tex_h = IOSurfaceGetHeightOfPlane(surface, i), }; + snprintf(out_frame->planes[i].swizzle, sizeof(out_frame->planes[i].swizzle), + "%s", f->gl[i].swizzle); } return 0; -- cgit v1.2.3