From af5a71f52ec9191aa20b602e3764d225b5d5029d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 29 Jun 2017 20:56:29 +0200
Subject: video: drop some unused IMGFMT aliases

These formats are supported in a generic way.

To get rid of IMGFMT_NV21, remove support from vo_direct3d.c completely.
---
 video/fmt-conversion.c  | 10 ----------
 video/img_format.h      | 15 +--------------
 video/out/vo_direct3d.c |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index 2dc3743be1..a7599b9c5c 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -30,15 +30,12 @@ static const struct {
     {IMGFMT_BGRA, AV_PIX_FMT_BGRA},
     {IMGFMT_BGR24, AV_PIX_FMT_BGR24},
     {IMGFMT_RGB565, AV_PIX_FMT_RGB565},
-    {IMGFMT_RGB48, AV_PIX_FMT_RGB48},
     {IMGFMT_ABGR, AV_PIX_FMT_ABGR},
     {IMGFMT_RGBA, AV_PIX_FMT_RGBA},
     {IMGFMT_RGB24, AV_PIX_FMT_RGB24},
-    {IMGFMT_PAL8,  AV_PIX_FMT_PAL8},
     {IMGFMT_YUYV,  AV_PIX_FMT_YUYV422},
     {IMGFMT_UYVY,  AV_PIX_FMT_UYVY422},
     {IMGFMT_NV12,  AV_PIX_FMT_NV12},
-    {IMGFMT_NV21,  AV_PIX_FMT_NV21},
     {IMGFMT_Y8,    AV_PIX_FMT_GRAY8},
     // FFmpeg prefers AV_PIX_FMT_GRAY8A, but Libav has only Y400A
     {IMGFMT_YA8,   AV_PIX_FMT_Y400A},
@@ -67,11 +64,6 @@ static const struct {
     {IMGFMT_444P,  AV_PIX_FMT_YUVJ444P},
     {IMGFMT_440P,  AV_PIX_FMT_YUVJ440P},
 
-    {IMGFMT_XYZ12,   AV_PIX_FMT_XYZ12},
-
-    {IMGFMT_RGBA64,  AV_PIX_FMT_RGBA64},
-    {IMGFMT_BGRA64,  AV_PIX_FMT_BGRA64},
-
 #if LIBAVUTIL_VERSION_MICRO >= 100
     {IMGFMT_BGR0,  AV_PIX_FMT_BGR0},
     {IMGFMT_0RGB,  AV_PIX_FMT_0RGB},
@@ -84,8 +76,6 @@ static const struct {
     {IMGFMT_0BGR,  AV_PIX_FMT_ABGR},
 #endif
 
-    {IMGFMT_YA16,  AV_PIX_FMT_YA16},
-
     {IMGFMT_VDPAU, AV_PIX_FMT_VDPAU},
 #if HAVE_VIDEOTOOLBOX_HWACCEL
     {IMGFMT_VIDEOTOOLBOX,   AV_PIX_FMT_VIDEOTOOLBOX},
diff --git a/video/img_format.h b/video/img_format.h
index 3411bd0b2c..e036d65adc 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -64,7 +64,7 @@
 // The only real paletted format we support is IMGFMT_PAL8, so check for that
 // format directly if you want an actual paletted format.
 #define MP_IMGFLAG_PAL 0x8000
-// planes don't contain real data; planes[3] contains an API-specific pointer
+// planes don't contain real data
 #define MP_IMGFLAG_HWACCEL 0x10000
 // Set if the chroma resolution is lower than luma resolution. Unset for non-YUV.
 #define MP_IMGFLAG_SUBSAMPLED 0x20000
@@ -169,7 +169,6 @@ enum mp_imgfmt {
 
     // Gray with alpha (packed)
     IMGFMT_YA8,
-    IMGFMT_YA16,
 
     // Packed YUV formats (components are byte-accessed)
     IMGFMT_YUYV,                // Y0 U  Y1 V
@@ -177,7 +176,6 @@ enum mp_imgfmt {
 
     // Y plane + packed plane for chroma
     IMGFMT_NV12,
-    IMGFMT_NV21,
 
     // Like IMGFMT_NV12, but with 10 bits per component (and 6 bits of padding)
     IMGFMT_P010,
@@ -193,9 +191,6 @@ enum mp_imgfmt {
     IMGFMT_RGBA,
     IMGFMT_BGR24,               // 3 bytes per pixel
     IMGFMT_RGB24,
-    IMGFMT_RGB48,               // 6 bytes per pixel, uint16_t channels
-    IMGFMT_RGBA64,              // 8 bytes per pixel, uint16_t channels
-    IMGFMT_BGRA64,
 
     // Like e.g. IMGFMT_ARGB, but has a padding byte instead of alpha
     IMGFMT_0RGB,
@@ -209,14 +204,6 @@ enum mp_imgfmt {
     // Accessed with bit-shifts after endian-swapping the uint16_t pixel
     IMGFMT_RGB565,              // 5r 6g 5b (MSB to LSB)
 
-    // The first plane has 1 byte per pixel. The second plane is a palette with
-    // 256 entries, with each entry encoded like in IMGFMT_BGR32.
-    IMGFMT_PAL8,
-
-    // XYZ colorspace, similar organization to RGB48. Even though it says "12",
-    // the components are stored as 16 bit, with lower 4 bits set to 0.
-    IMGFMT_XYZ12,
-
     // Hardware accelerated formats. Plane data points to special data
     // structures, instead of pixel data.
     IMGFMT_VDPAU,           // VdpVideoSurface
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 63de6fee4a..5be8757a5f 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_410P,  MAKEFOURCC('Y','V','U','9')},
     {IMGFMT_NV12,  MAKEFOURCC('N','V','1','2')},
-    {IMGFMT_NV21,  MAKEFOURCC('N','V','2','1')},
     // packed YUV
     {IMGFMT_YUYV,  D3DFMT_YUY2},
     {IMGFMT_UYVY,  D3DFMT_UYVY},
-- 
cgit v1.2.3