From 60da39553ff92cf741bf7f54daff636bb28cbb3c Mon Sep 17 00:00:00 2001 From: Eugene Syromyatnikov Date: Wed, 24 Jul 2019 00:32:53 +0200 Subject: [PATCH] xlat/v4l2_pix_fmts.in: work around V4L2_PIX_FMT_BGRA444 value change * xlat/v4l2_pix_fmts.in: Undefine V4L2_PIX_FMT_BGRA444 as it has changed its value in Linux commit v5.2-rc5-403-g22be8233b34f. Signed-off-by: Baruch Siach --- Upstream status: commit 60da39553ff92 xlat/v4l2_pix_fmts.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xlat/v4l2_pix_fmts.in b/xlat/v4l2_pix_fmts.in index 3276d3818a12..e742d07ac51c 100644 --- a/xlat/v4l2_pix_fmts.in +++ b/xlat/v4l2_pix_fmts.in @@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */ V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */ V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ -V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */ +#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 +# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 +/* + * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with + * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit + * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12. + */ +# undef V4L2_PIX_FMT_BGRA444 +#endif +V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16 rrrrgggg bbbbaaaa */ V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16 aaaabbbb ggggrrrr */ V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */ -- 2.23.0.rc1