summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-28 14:21:32 +0200
committerwm4 <wm4@nowhere>2016-09-28 14:21:32 +0200
commit73a5bde518d3ddc5ca847ab1afb8453106ea78d7 (patch)
tree6150e0c8a74e9f2153e2c270640ffec75a57e101
parentb712095d894c1ee8aba833e0263c40ce0a59e9c5 (diff)
downloadmpv-73a5bde518d3ddc5ca847ab1afb8453106ea78d7.tar.bz2
mpv-73a5bde518d3ddc5ca847ab1afb8453106ea78d7.tar.xz
img_format: remove some unneeded format definitions
They're still supported, just that they have no IMGFMT_ alias.
-rw-r--r--video/fmt-conversion.c9
-rw-r--r--video/img_format.h6
2 files changed, 0 insertions, 15 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index aa78e99f9b..32330ddeb1 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -73,15 +73,6 @@ static const struct {
{IMGFMT_XYZ12, AV_PIX_FMT_XYZ12},
-#ifdef AV_PIX_FMT_YUV420P12
- {IMGFMT_420P12, AV_PIX_FMT_YUV420P12},
- {IMGFMT_420P14, AV_PIX_FMT_YUV420P14},
- {IMGFMT_422P12, AV_PIX_FMT_YUV422P12},
- {IMGFMT_422P14, AV_PIX_FMT_YUV422P14},
- {IMGFMT_444P12, AV_PIX_FMT_YUV444P12},
- {IMGFMT_444P14, AV_PIX_FMT_YUV444P14},
-#endif
-
#ifdef AV_PIX_FMT_RGBA64
{IMGFMT_RGBA64, AV_PIX_FMT_RGBA64},
{IMGFMT_BGRA64, AV_PIX_FMT_BGRA64},
diff --git a/video/img_format.h b/video/img_format.h
index 41463195ac..a91dcf865c 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -119,20 +119,14 @@ enum mp_imgfmt {
// most significant bits with 0 (use shifts to expand them to 16 bits).
IMGFMT_444P16,
- IMGFMT_444P14,
- IMGFMT_444P12,
IMGFMT_444P10,
IMGFMT_444P9,
IMGFMT_422P16,
- IMGFMT_422P14,
- IMGFMT_422P12,
IMGFMT_422P10,
IMGFMT_422P9,
IMGFMT_420P16,
- IMGFMT_420P14,
- IMGFMT_420P12,
IMGFMT_420P10,
IMGFMT_420P9,