Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[sfrench/cifs-2.6.git] / Documentation / media / uapi / v4l / subdev-formats.rst

diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
index b1eea44550e1f4562bc1fc90d87702dde27302d7..9fcabe7f9367ee5be82fa6f4a8fe5f92de2b46b6 100644 (file)
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -16,10 +16,14 @@ Media Bus Formats
 
     * - __u32
       - ``width``
-      - Image width, in pixels.
+      - Image width in pixels.
     * - __u32
       - ``height``
-      - Image height, in pixels.
+      - Image height in pixels. If ``field`` is one of ``V4L2_FIELD_TOP``,
+       ``V4L2_FIELD_BOTTOM`` or ``V4L2_FIELD_ALTERNATE`` then height
+       refers to the number of lines in the field, otherwise it refers to
+       the number of lines in the frame (which is twice the field height
+       for interlaced formats).
     * - __u32
       - ``code``
       - Format code, from enum