From b0ece2b31fdf6914bf31d02b7e5a007095d436d3 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Fri, 15 Sep 2017 21:05:49 +0100 Subject: hwcontext_vaapi: Fix DRM format mapping --- libavutil/hwcontext_vaapi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libavutil/hwcontext_vaapi.c') diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 852f0abda2..c4473a229f 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -925,16 +925,16 @@ static const struct { #if defined(VA_FOURCC_P010) && defined(DRM_FORMAT_R16) DRM_MAP(P010, 2, DRM_FORMAT_R16, DRM_FORMAT_RG1616), #endif - DRM_MAP(BGRA, 1, DRM_FORMAT_BGRA8888), - DRM_MAP(BGRX, 1, DRM_FORMAT_BGRX8888), - DRM_MAP(RGBA, 1, DRM_FORMAT_RGBA8888), - DRM_MAP(RGBX, 1, DRM_FORMAT_RGBX8888), + DRM_MAP(BGRA, 1, DRM_FORMAT_ARGB8888), + DRM_MAP(BGRX, 1, DRM_FORMAT_XRGB8888), + DRM_MAP(RGBA, 1, DRM_FORMAT_ABGR8888), + DRM_MAP(RGBX, 1, DRM_FORMAT_XBGR8888), #ifdef VA_FOURCC_ABGR - DRM_MAP(ABGR, 1, DRM_FORMAT_ABGR8888), - DRM_MAP(XBGR, 1, DRM_FORMAT_XBGR8888), + DRM_MAP(ABGR, 1, DRM_FORMAT_RGBA8888), + DRM_MAP(XBGR, 1, DRM_FORMAT_RGBX8888), #endif - DRM_MAP(ARGB, 1, DRM_FORMAT_ARGB8888), - DRM_MAP(XRGB, 1, DRM_FORMAT_XRGB8888), + DRM_MAP(ARGB, 1, DRM_FORMAT_BGRA8888), + DRM_MAP(XRGB, 1, DRM_FORMAT_BGRX8888), }; #undef DRM_MAP -- cgit v1.2.3