summaryrefslogtreecommitdiffstats
path: root/video/img_format.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-29 20:56:29 +0200
committerwm4 <wm4@nowhere>2017-06-29 20:56:29 +0200
commitaf5a71f52ec9191aa20b602e3764d225b5d5029d (patch)
treeb532559a9d6204a9f7d4ad96331f0601b6baf29a /video/img_format.h
parent1dffcb01678c20294fa60a0402b02acaeab65606 (diff)
downloadmpv-af5a71f52ec9191aa20b602e3764d225b5d5029d.tar.bz2
mpv-af5a71f52ec9191aa20b602e3764d225b5d5029d.tar.xz
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.
Diffstat (limited to 'video/img_format.h')
-rw-r--r--video/img_format.h15
1 files changed, 1 insertions, 14 deletions
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