From 300f6a334498059f28ec63406112348c7e00fa64 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 29 Jun 2017 21:30:10 +0200 Subject: video: drop some more IMGFMT aliases For vo_opengl and vo_direct3d, these are supported in a generic way. For vf_vapoursynth, we could probably map its VSFormat struct in a generic way, but for now do some bullshit. vf_eq.c actually loses support for these formats. We could add generic support too (anything that has 8 bit planes will work), but why bother. The filter is deprecated anyway. --- video/fmt-conversion.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'video/fmt-conversion.c') diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index a7599b9c5c..a4dca893cc 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -40,29 +40,13 @@ static const struct { // FFmpeg prefers AV_PIX_FMT_GRAY8A, but Libav has only Y400A {IMGFMT_YA8, AV_PIX_FMT_Y400A}, {IMGFMT_Y16, AV_PIX_FMT_GRAY16}, - {IMGFMT_410P, AV_PIX_FMT_YUV410P}, {IMGFMT_420P, AV_PIX_FMT_YUV420P}, - {IMGFMT_411P, AV_PIX_FMT_YUV411P}, - {IMGFMT_422P, AV_PIX_FMT_YUV422P}, {IMGFMT_444P, AV_PIX_FMT_YUV444P}, - {IMGFMT_440P, AV_PIX_FMT_YUV440P}, - - {IMGFMT_420P16, AV_PIX_FMT_YUV420P16}, - {IMGFMT_420P9, AV_PIX_FMT_YUV420P9}, - {IMGFMT_420P10, AV_PIX_FMT_YUV420P10}, - {IMGFMT_422P10, AV_PIX_FMT_YUV422P10}, - {IMGFMT_444P9, AV_PIX_FMT_YUV444P9}, - {IMGFMT_444P10, AV_PIX_FMT_YUV444P10}, - {IMGFMT_422P16, AV_PIX_FMT_YUV422P16}, - {IMGFMT_422P9, AV_PIX_FMT_YUV422P9}, - {IMGFMT_444P16, AV_PIX_FMT_YUV444P16}, // YUVJ are YUV formats that use the full Y range. Decoder color range // information is used instead. Deprecated in ffmpeg. {IMGFMT_420P, AV_PIX_FMT_YUVJ420P}, - {IMGFMT_422P, AV_PIX_FMT_YUVJ422P}, {IMGFMT_444P, AV_PIX_FMT_YUVJ444P}, - {IMGFMT_440P, AV_PIX_FMT_YUVJ440P}, #if LIBAVUTIL_VERSION_MICRO >= 100 {IMGFMT_BGR0, AV_PIX_FMT_BGR0}, @@ -95,9 +79,6 @@ static const struct { {IMGFMT_CUDA, AV_PIX_FMT_CUDA}, #endif {IMGFMT_P010, AV_PIX_FMT_P010}, -#ifdef AV_PIX_FMT_P016 - {IMGFMT_P016, AV_PIX_FMT_P016}, -#endif {0, AV_PIX_FMT_NONE} }; -- cgit v1.2.3