Merge tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree into media_stage

[linux.git] / drivers / media / v4l2-core / v4l2-ioctl.c

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 8cb4b976064edac0f2d3eea58fb9766d08cf14a6..de9efa94fec90673760443b53b30a9f61d278f98 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1347,23 +1347,23 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
        case V4L2_PIX_FMT_YUV420:       descr = "Planar YUV 4:2:0"; break;
        case V4L2_PIX_FMT_HI240:        descr = "8-bit Dithered RGB (BTTV)"; break;
        case V4L2_PIX_FMT_M420:         descr = "YUV 4:2:0 (M420)"; break;
-       case V4L2_PIX_FMT_NV12:         descr = "Y/CbCr 4:2:0"; break;
-       case V4L2_PIX_FMT_NV21:         descr = "Y/CrCb 4:2:0"; break;
-       case V4L2_PIX_FMT_NV16:         descr = "Y/CbCr 4:2:2"; break;
-       case V4L2_PIX_FMT_NV61:         descr = "Y/CrCb 4:2:2"; break;
-       case V4L2_PIX_FMT_NV24:         descr = "Y/CbCr 4:4:4"; break;
-       case V4L2_PIX_FMT_NV42:         descr = "Y/CrCb 4:4:4"; break;
-       case V4L2_PIX_FMT_P010:         descr = "10-bit Y/CbCr 4:2:0"; break;
-       case V4L2_PIX_FMT_NV12_4L4:     descr = "Y/CbCr 4:2:0 (4x4 Linear)"; break;
-       case V4L2_PIX_FMT_NV12_16L16:   descr = "Y/CbCr 4:2:0 (16x16 Linear)"; break;
-       case V4L2_PIX_FMT_NV12_32L32:   descr = "Y/CbCr 4:2:0 (32x32 Linear)"; break;
-       case V4L2_PIX_FMT_P010_4L4:     descr = "10-bit Y/CbCr 4:2:0 (4x4 Linear)"; break;
-       case V4L2_PIX_FMT_NV12M:        descr = "Y/CbCr 4:2:0 (N-C)"; break;
-       case V4L2_PIX_FMT_NV21M:        descr = "Y/CrCb 4:2:0 (N-C)"; break;
-       case V4L2_PIX_FMT_NV16M:        descr = "Y/CbCr 4:2:2 (N-C)"; break;
-       case V4L2_PIX_FMT_NV61M:        descr = "Y/CrCb 4:2:2 (N-C)"; break;
-       case V4L2_PIX_FMT_NV12MT:       descr = "Y/CbCr 4:2:0 (64x32 MB, N-C)"; break;
-       case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break;
+       case V4L2_PIX_FMT_NV12:         descr = "Y/UV 4:2:0"; break;
+       case V4L2_PIX_FMT_NV21:         descr = "Y/VU 4:2:0"; break;
+       case V4L2_PIX_FMT_NV16:         descr = "Y/UV 4:2:2"; break;
+       case V4L2_PIX_FMT_NV61:         descr = "Y/VU 4:2:2"; break;
+       case V4L2_PIX_FMT_NV24:         descr = "Y/UV 4:4:4"; break;
+       case V4L2_PIX_FMT_NV42:         descr = "Y/VU 4:4:4"; break;
+       case V4L2_PIX_FMT_P010:         descr = "10-bit Y/UV 4:2:0"; break;
+       case V4L2_PIX_FMT_NV12_4L4:     descr = "Y/UV 4:2:0 (4x4 Linear)"; break;
+       case V4L2_PIX_FMT_NV12_16L16:   descr = "Y/UV 4:2:0 (16x16 Linear)"; break;
+       case V4L2_PIX_FMT_NV12_32L32:   descr = "Y/UV 4:2:0 (32x32 Linear)"; break;
+       case V4L2_PIX_FMT_P010_4L4:     descr = "10-bit Y/UV 4:2:0 (4x4 Linear)"; break;
+       case V4L2_PIX_FMT_NV12M:        descr = "Y/UV 4:2:0 (N-C)"; break;
+       case V4L2_PIX_FMT_NV21M:        descr = "Y/VU 4:2:0 (N-C)"; break;
+       case V4L2_PIX_FMT_NV16M:        descr = "Y/UV 4:2:2 (N-C)"; break;
+       case V4L2_PIX_FMT_NV61M:        descr = "Y/VU 4:2:2 (N-C)"; break;
+       case V4L2_PIX_FMT_NV12MT:       descr = "Y/UV 4:2:0 (64x32 MB, N-C)"; break;
+       case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/UV 4:2:0 (16x16 MB, N-C)"; break;
        case V4L2_PIX_FMT_YUV420M:      descr = "Planar YUV 4:2:0 (N-C)"; break;
        case V4L2_PIX_FMT_YVU420M:      descr = "Planar YVU 4:2:0 (N-C)"; break;
        case V4L2_PIX_FMT_YUV422M:      descr = "Planar YUV 4:2:2 (N-C)"; break;