From 6ff20c71ab93139d150a26612e2ef90168f71dfb Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 17 Jun 2020 16:18:07 +0200 Subject: video: alias IMGFMT_RGB30 to AV_PIX_FMT_X2RGB10 IMGFMT_RGB30 was added first; FFmpeg added AV_PIX_FMT_X2RGB10 later. This is exactly the same, so treat them as such. For some reason, libswscale still seems to output incompatible data - not sure what this is about, but I'm not going to debug it. --- video/fmt-conversion.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 8c9aa40bfa..5194221d50 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -53,6 +53,10 @@ static const struct { {IMGFMT_RGBA64, AV_PIX_FMT_RGBA64}, +#ifdef AV_PIX_FMT_X2RGB10 + {IMGFMT_RGB30, AV_PIX_FMT_X2RGB10}, +#endif + {IMGFMT_VDPAU, AV_PIX_FMT_VDPAU}, {IMGFMT_VIDEOTOOLBOX, AV_PIX_FMT_VIDEOTOOLBOX}, {IMGFMT_MEDIACODEC, AV_PIX_FMT_MEDIACODEC}, -- cgit v1.2.3