From af5a71f52ec9191aa20b602e3764d225b5d5029d Mon Sep 17 00:00:00 2001 From: wm4 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 ---------- 1 file changed, 10 deletions(-) (limited to 'video/fmt-conversion.c') 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}, -- cgit v1.2.3