summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-15 17:52:13 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-22 10:04:16 -0300
commit806da2986f08756c8ee8831e39237dddc96afc38 (patch)
treeef950ae96ca8ba0c128a2bf8a68faee8d830755a
parentb6b6e67824ec0593878afbee5958d80205606210 (diff)
downloadlinux-0-day-806da2986f08756c8ee8831e39237dddc96afc38.tar.gz
linux-0-day-806da2986f08756c8ee8831e39237dddc96afc38.tar.xz
[media] docs-rst: get rid of code-block inside tables
There are two tables with a C code-block inside it. Unfortunately, that causes LaTeX output to break. Yet, there's nothing special there, so let's remove the code-block from them. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--Documentation/media/uapi/v4l/vidioc-enum-fmt.rst5
-rw-r--r--Documentation/media/uapi/v4l/vidioc-querycap.rst12
2 files changed, 4 insertions, 13 deletions
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 4715261631ab0..13d5b509a829c 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -105,11 +105,8 @@ one until ``EINVAL`` is returned.
- :cspan:`2`
-
.. _v4l2-fourcc:
- .. code-block:: c
-
- #define v4l2_fourcc(a,b,c,d) (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
+ ``#define v4l2_fourcc(a,b,c,d) (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))``
Several image formats are already defined by this specification in
:ref:`pixfmt`.
diff --git a/Documentation/media/uapi/v4l/vidioc-querycap.rst b/Documentation/media/uapi/v4l/vidioc-querycap.rst
index b10fed313f997..f37fc3badcdf6 100644
--- a/Documentation/media/uapi/v4l/vidioc-querycap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querycap.rst
@@ -117,17 +117,11 @@ specification the ioctl returns an ``EINVAL`` error code.
- :cspan:`2`
+ ``#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))``
- .. code-block:: c
+ ``__u32 version = KERNEL_VERSION(0, 8, 1);``
- #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-
- __u32 version = KERNEL_VERSION(0, 8, 1);
-
- printf ("Version: %u.%u.%u\\n",
- (version >> 16) & 0xFF,
- (version >> 8) & 0xFF,
- version & 0xFF);
+ ``printf ("Version: %u.%u.%u\\n", (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);``
- .. row 6