diff options
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/opengl/formats.c | 8 | ||||
| -rw-r--r-- | video/out/vo_direct3d.c | 1 | ||||
| -rw-r--r-- | video/out/vo_sdl.c | 1 | ||||
| -rw-r--r-- | video/out/vo_xv.c | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/video/out/opengl/formats.c b/video/out/opengl/formats.c index 5678e0f75f..2cbc130170 100644 --- a/video/out/opengl/formats.c +++ b/video/out/opengl/formats.c @@ -90,8 +90,6 @@ static const struct gl_format gl_formats[] = { GL_UNSIGNED_SHORT_5_6_5, F_TF | F_GL2 | F_GL3}, {GL_RGB, GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, F_TF | F_APPL}, - {GL_RGB, GL_RGB_422_APPLE, - GL_UNSIGNED_SHORT_8_8_REV_APPLE, F_TF | F_APPL}, {0} }; @@ -324,11 +322,9 @@ bool gl_get_imgfmt_desc(GL *gl, int imgfmt, struct gl_imgfmt_desc *out) res.chroma_w = res.chroma_h = 1; goto supported; } - if (imgfmt == IMGFMT_UYVY || imgfmt == IMGFMT_YUYV) { + if (imgfmt == IMGFMT_UYVY) { res.num_planes = 1; - res.planes[0] = gl_find_gl_type_format(gl, imgfmt == IMGFMT_UYVY - ? GL_UNSIGNED_SHORT_8_8_APPLE - : GL_UNSIGNED_SHORT_8_8_REV_APPLE); + res.planes[0] = gl_find_gl_type_format(gl, GL_UNSIGNED_SHORT_8_8_APPLE); if (!res.planes[0]) return false; res.components[0][0] = 3; diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 84b5d59ec9..9980a833c7 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -207,7 +207,6 @@ static const struct fmt_entry fmt_table[] = { {IMGFMT_420P, MAKEFOURCC('I','Y','U','V')}, {IMGFMT_NV12, MAKEFOURCC('N','V','1','2')}, // packed YUV - {IMGFMT_YUYV, D3DFMT_YUY2}, {IMGFMT_UYVY, D3DFMT_UYVY}, // packed RGB {IMGFMT_BGR32, D3DFMT_X8R8G8B8}, diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index e32e89aaf3..a1d0b248eb 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -54,7 +54,6 @@ struct formatmap_entry { const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_YV12, IMGFMT_420P, 0}, {SDL_PIXELFORMAT_IYUV, IMGFMT_420P, 0}, - {SDL_PIXELFORMAT_YUY2, IMGFMT_YUYV, 0}, {SDL_PIXELFORMAT_UYVY, IMGFMT_UYVY, 0}, //{SDL_PIXELFORMAT_YVYU, IMGFMT_YVYU, 0}, #if BYTE_ORDER == BIG_ENDIAN diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 0af6f436be..82d7c8bd7c 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -104,7 +104,6 @@ struct xvctx { #define MP_FOURCC_I420 MP_FOURCC('I', '4', '2', '0') #define MP_FOURCC_IYUV MP_FOURCC('I', 'Y', 'U', 'V') #define MP_FOURCC_UYVY MP_FOURCC('U', 'Y', 'V', 'Y') -#define MP_FOURCC_YUY2 MP_FOURCC('Y', 'U', 'Y', '2') struct fmt_entry { int imgfmt; @@ -113,7 +112,6 @@ struct fmt_entry { static const struct fmt_entry fmt_table[] = { {IMGFMT_420P, MP_FOURCC_YV12}, {IMGFMT_420P, MP_FOURCC_I420}, - {IMGFMT_YUYV, MP_FOURCC_YUY2}, {IMGFMT_UYVY, MP_FOURCC_UYVY}, {0} }; |