summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-05 01:03:08 +0100
committerwm4 <wm4@nowhere>2014-11-05 01:52:19 +0100
commit91471deecc97382d7998bd9f3b2bbbb5473ecba3 (patch)
tree5477de542ef21efd0f4133f0872d5b88ee9dc4e0
parent5fc29e459f0691e843ff0f26eef790c8cfa73afc (diff)
downloadmpv-91471deecc97382d7998bd9f3b2bbbb5473ecba3.tar.bz2
mpv-91471deecc97382d7998bd9f3b2bbbb5473ecba3.tar.xz
video: remove aliases for some rarely referenced image formats
These formats are still supported; you just can't reference them via a defined constants directly. They are now handled via the generic passthrough. (If you want to use such a format, you either have to add the entry back, or use AV_PIX_FMT_* directly.)
-rw-r--r--video/fmt-conversion.c33
-rw-r--r--video/img_format.h49
2 files changed, 0 insertions, 82 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index 68d1487283..09ff925577 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -57,12 +57,6 @@ static const struct {
{IMGFMT_BGR4, AV_PIX_FMT_BGR4},
{IMGFMT_PAL8, AV_PIX_FMT_PAL8},
{IMGFMT_GBRP, AV_PIX_FMT_GBRP},
- {IMGFMT_GBRP9_BE, AV_PIX_FMT_GBRP9BE},
- {IMGFMT_GBRP9_LE, AV_PIX_FMT_GBRP9LE},
- {IMGFMT_GBRP10_BE, AV_PIX_FMT_GBRP10BE},
- {IMGFMT_GBRP10_LE, AV_PIX_FMT_GBRP10LE},
- {IMGFMT_GBRP16_BE, AV_PIX_FMT_GBRP16BE},
- {IMGFMT_GBRP16_LE, AV_PIX_FMT_GBRP16LE},
{IMGFMT_YUYV, AV_PIX_FMT_YUYV422},
{IMGFMT_UYVY, AV_PIX_FMT_UYVY422},
{IMGFMT_NV12, AV_PIX_FMT_NV12},
@@ -106,31 +100,9 @@ static const struct {
{IMGFMT_440P, AV_PIX_FMT_YUVJ440P},
{IMGFMT_420AP, AV_PIX_FMT_YUVA420P},
-
{IMGFMT_422AP, AV_PIX_FMT_YUVA422P},
{IMGFMT_444AP, AV_PIX_FMT_YUVA444P},
- {IMGFMT_420AP9_BE, AV_PIX_FMT_YUVA420P9BE},
- {IMGFMT_420AP9_LE, AV_PIX_FMT_YUVA420P9LE},
- {IMGFMT_420AP10_BE, AV_PIX_FMT_YUVA420P10BE},
- {IMGFMT_420AP10_LE, AV_PIX_FMT_YUVA420P10LE},
- {IMGFMT_420AP16_BE, AV_PIX_FMT_YUVA420P16BE},
- {IMGFMT_420AP16_LE, AV_PIX_FMT_YUVA420P16LE},
-
- {IMGFMT_422AP9_BE, AV_PIX_FMT_YUVA422P9BE},
- {IMGFMT_422AP9_LE, AV_PIX_FMT_YUVA422P9LE},
- {IMGFMT_422AP10_BE, AV_PIX_FMT_YUVA422P10BE},
- {IMGFMT_422AP10_LE, AV_PIX_FMT_YUVA422P10LE},
- {IMGFMT_422AP16_BE, AV_PIX_FMT_YUVA422P16BE},
- {IMGFMT_422AP16_LE, AV_PIX_FMT_YUVA422P16LE},
-
- {IMGFMT_444AP9_BE, AV_PIX_FMT_YUVA444P9BE},
- {IMGFMT_444AP9_LE, AV_PIX_FMT_YUVA444P9LE},
- {IMGFMT_444AP10_BE, AV_PIX_FMT_YUVA444P10BE},
- {IMGFMT_444AP10_LE, AV_PIX_FMT_YUVA444P10LE},
- {IMGFMT_444AP16_BE, AV_PIX_FMT_YUVA444P16BE},
- {IMGFMT_444AP16_LE, AV_PIX_FMT_YUVA444P16LE},
-
{IMGFMT_XYZ12_LE, AV_PIX_FMT_XYZ12LE},
{IMGFMT_XYZ12_BE, AV_PIX_FMT_XYZ12BE},
@@ -149,11 +121,6 @@ static const struct {
{IMGFMT_444P14_BE, AV_PIX_FMT_YUV444P14BE},
{IMGFMT_444P14_LE, AV_PIX_FMT_YUV444P14LE},
- {IMGFMT_GBRP12_BE, AV_PIX_FMT_GBRP12BE},
- {IMGFMT_GBRP12_LE, AV_PIX_FMT_GBRP12LE},
- {IMGFMT_GBRP14_BE, AV_PIX_FMT_GBRP14BE},
- {IMGFMT_GBRP14_LE, AV_PIX_FMT_GBRP14LE},
-
{IMGFMT_RGBA64_BE, AV_PIX_FMT_RGBA64BE},
{IMGFMT_RGBA64_LE, AV_PIX_FMT_RGBA64LE},
{IMGFMT_BGRA64_BE, AV_PIX_FMT_BGRA64BE},
diff --git a/video/img_format.h b/video/img_format.h
index 8d01b86416..17062bbf68 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -144,27 +144,6 @@ enum mp_imgfmt {
IMGFMT_422AP,
IMGFMT_420AP,
- IMGFMT_444AP16_LE,
- IMGFMT_444AP16_BE,
- IMGFMT_444AP10_LE,
- IMGFMT_444AP10_BE,
- IMGFMT_444AP9_LE,
- IMGFMT_444AP9_BE,
-
- IMGFMT_422AP16_LE,
- IMGFMT_422AP16_BE,
- IMGFMT_422AP10_LE,
- IMGFMT_422AP10_BE,
- IMGFMT_422AP9_LE,
- IMGFMT_422AP9_BE,
-
- IMGFMT_420AP16_LE,
- IMGFMT_420AP16_BE,
- IMGFMT_420AP10_LE,
- IMGFMT_420AP10_BE,
- IMGFMT_420AP9_LE,
- IMGFMT_420AP9_BE,
-
// Gray
IMGFMT_Y8,
IMGFMT_Y16_LE,
@@ -236,16 +215,6 @@ enum mp_imgfmt {
// Planar RGB (planes are shuffled: plane 0 is G, etc.)
IMGFMT_GBRP,
- IMGFMT_GBRP9_LE, // similar organization to IMGFMT_444P9_LE
- IMGFMT_GBRP9_BE,
- IMGFMT_GBRP10_LE,
- IMGFMT_GBRP10_BE,
- IMGFMT_GBRP12_LE,
- IMGFMT_GBRP12_BE,
- IMGFMT_GBRP14_LE,
- IMGFMT_GBRP14_BE,
- IMGFMT_GBRP16_LE,
- IMGFMT_GBRP16_BE,
// 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.
@@ -306,26 +275,8 @@ enum mp_imgfmt {
IMGFMT_420P10 = MP_SELECT_LE_BE(IMGFMT_420P10_LE, IMGFMT_420P10_BE),
IMGFMT_420P9 = MP_SELECT_LE_BE(IMGFMT_420P9_LE, IMGFMT_420P9_BE),
- IMGFMT_444AP16 = MP_SELECT_LE_BE(IMGFMT_444AP16_LE, IMGFMT_444AP16_BE),
- IMGFMT_444AP10 = MP_SELECT_LE_BE(IMGFMT_444AP10_LE, IMGFMT_444AP10_BE),
- IMGFMT_444AP9 = MP_SELECT_LE_BE(IMGFMT_444AP9_LE, IMGFMT_444AP9_BE),
-
- IMGFMT_422AP16 = MP_SELECT_LE_BE(IMGFMT_422AP16_LE, IMGFMT_422AP16_BE),
- IMGFMT_422AP10 = MP_SELECT_LE_BE(IMGFMT_422AP10_LE, IMGFMT_422AP10_BE),
- IMGFMT_422AP9 = MP_SELECT_LE_BE(IMGFMT_422AP9_LE, IMGFMT_422AP9_BE),
-
- IMGFMT_420AP16 = MP_SELECT_LE_BE(IMGFMT_420AP16_LE, IMGFMT_420AP16_BE),
- IMGFMT_420AP10 = MP_SELECT_LE_BE(IMGFMT_420AP10_LE, IMGFMT_420AP10_BE),
- IMGFMT_420AP9 = MP_SELECT_LE_BE(IMGFMT_420AP9_LE, IMGFMT_420AP9_BE),
-
IMGFMT_Y16 = MP_SELECT_LE_BE(IMGFMT_Y16_LE, IMGFMT_Y16_BE),
- IMGFMT_GBRP9 = MP_SELECT_LE_BE(IMGFMT_GBRP9_LE, IMGFMT_GBRP9_BE),
- IMGFMT_GBRP10 = MP_SELECT_LE_BE(IMGFMT_GBRP10_LE, IMGFMT_GBRP10_BE),
- IMGFMT_GBRP12 = MP_SELECT_LE_BE(IMGFMT_GBRP12_LE, IMGFMT_GBRP12_BE),
- IMGFMT_GBRP14 = MP_SELECT_LE_BE(IMGFMT_GBRP14_LE, IMGFMT_GBRP14_BE),
- IMGFMT_GBRP16 = MP_SELECT_LE_BE(IMGFMT_GBRP16_LE, IMGFMT_GBRP16_BE),
-
IMGFMT_XYZ12 = MP_SELECT_LE_BE(IMGFMT_XYZ12_LE, IMGFMT_XYZ12_BE),
};