summaryrefslogtreecommitdiff
path: root/Documentation/media
diff options
context:
space:
mode:
authorHans Verkuil <hansverk@cisco.com>2016-07-12 17:31:15 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-12 18:31:10 +0300
commit0a07ab9a80fda60f8bdcf3c2fd1b191b47392be5 (patch)
tree24048df5df8ff44642b61a21d67054a5bb8f96ea /Documentation/media
parente70fb059a4d3eb5c3fabf1b1ef5f33ecb84e9194 (diff)
downloadlinux-0a07ab9a80fda60f8bdcf3c2fd1b191b47392be5.tar.xz
[media] pixfmt-006.rst: add missing V4L2_YCBCR_ENC_SMPTE240M
Fix missing documentation, and its cross reference. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/uapi/v4l/pixfmt-006.rst6
-rw-r--r--Documentation/media/videodev2.h.rst.exceptions4
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/media/uapi/v4l/pixfmt-006.rst b/Documentation/media/uapi/v4l/pixfmt-006.rst
index 9a0f494e2851..987b9a8a9eb4 100644
--- a/Documentation/media/uapi/v4l/pixfmt-006.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-006.rst
@@ -240,6 +240,12 @@ needs to be filled in.
- Use the constant luminance BT.2020 Yc'CbcCrc encoding.
+ - .. row 10
+
+ - ``V4L2_YCBCR_ENC_SMPTE_240M``
+
+ - Use the SMPTE 240M Y'CbCr encoding.
+
.. _v4l2-quantization:
diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
index 57e4ef5a5a30..aaba429ceb7d 100644
--- a/Documentation/media/videodev2.h.rst.exceptions
+++ b/Documentation/media/videodev2.h.rst.exceptions
@@ -85,9 +85,7 @@ replace symbol V4L2_YCBCR_ENC_DEFAULT v4l2-ycbcr-encoding
replace symbol V4L2_YCBCR_ENC_SYCC v4l2-ycbcr-encoding
replace symbol V4L2_YCBCR_ENC_XV601 v4l2-ycbcr-encoding
replace symbol V4L2_YCBCR_ENC_XV709 v4l2-ycbcr-encoding
-
-# Is this deprecated, or just a missing reference?
-replace symbol V4L2_YCBCR_ENC_SMPTE240M v4l2-ycbcr-encoding-FIXME
+replace symbol V4L2_YCBCR_ENC_SMPTE240M v4l2-ycbcr-encoding
# Documented enum v4l2_quantization
replace symbol V4L2_QUANTIZATION_DEFAULT v4l2-quantization