summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-02-17 13:59:21 +0100
committerwm4 <wm4@nowhere>2017-02-17 14:14:58 +0100
commitb5eb326dcb88a309f3b89dc7309f226f2488eb63 (patch)
tree6788ef522e528fc51f0929a40f4f3520dea1eb2d /video
parent2b5577901d43841fcb7930db62ff881becbcc4de (diff)
downloadmpv-b5eb326dcb88a309f3b89dc7309f226f2488eb63.tar.bz2
mpv-b5eb326dcb88a309f3b89dc7309f226f2488eb63.tar.xz
videotoolbox: fix RGB format
Wrong colors. This didn't matter for the OpenGL interop code, because the CV format was mapped to the correct texture format.
Diffstat (limited to 'video')
-rw-r--r--video/out/opengl/hwdec_osx.c2
-rw-r--r--video/vt.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/video/out/opengl/hwdec_osx.c b/video/out/opengl/hwdec_osx.c
index aa350209ec..734e3a2e0e 100644
--- a/video/out/opengl/hwdec_osx.c
+++ b/video/out/opengl/hwdec_osx.c
@@ -79,7 +79,7 @@ static struct vt_format vt_formats[] = {
},
{
.cvpixfmt = kCVPixelFormatType_32BGRA,
- .imgfmt = IMGFMT_RGB0,
+ .imgfmt = IMGFMT_BGR0,
.planes = 1,
.gl = {
{ GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, GL_RGBA }
diff --git a/video/vt.c b/video/vt.c
index 90c955049d..f0804d38a0 100644
--- a/video/vt.c
+++ b/video/vt.c
@@ -9,7 +9,7 @@
static const uint32_t map_imgfmt_cvpixfmt[][2] = {
{IMGFMT_420P, kCVPixelFormatType_420YpCbCr8Planar},
{IMGFMT_UYVY, kCVPixelFormatType_422YpCbCr8},
- {IMGFMT_RGB0, kCVPixelFormatType_32BGRA},
+ {IMGFMT_BGR0, kCVPixelFormatType_32BGRA},
{IMGFMT_NV12, kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange},
{0}
};