summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorKamil Debski <k.debski@samsung.com>2014-05-14 11:31:09 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:59:39 +0900
commit6c8179fb3ffc4bd86826ceb5699091e9bed68978 (patch)
tree3d27b0c0d5a4cca4e441a0ee96d6165effb90769 /Documentation
parent4388c70db9512a03386df9411ab2287dc48d6972 (diff)
downloadlinux-3.10-6c8179fb3ffc4bd86826ceb5699091e9bed68978.tar.gz
linux-3.10-6c8179fb3ffc4bd86826ceb5699091e9bed68978.tar.bz2
linux-3.10-6c8179fb3ffc4bd86826ceb5699091e9bed68978.zip
upstream: [media] v4l: Fix documentation of V4L2_PIX_FMT_H264_MVC and VP8 pixel formats
The 'Code' column in the documentation should provide the real fourcc code that is used. Changed the documentation to provide the fourcc defined in videodev2.h Signed-off-by: Kamil Debski <k.debski@samsung.com> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index acd7f431f4b..c969f590578 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -772,7 +772,7 @@ extended control <constant>V4L2_CID_MPEG_STREAM_TYPE</constant>, see
</row>
<row id="V4L2-PIX-FMT-H264-MVC">
<entry><constant>V4L2_PIX_FMT_H264_MVC</constant></entry>
- <entry>'MVC'</entry>
+ <entry>'M264'</entry>
<entry>H264 MVC video elementary stream.</entry>
</row>
<row id="V4L2-PIX-FMT-H263">
@@ -812,7 +812,7 @@ extended control <constant>V4L2_CID_MPEG_STREAM_TYPE</constant>, see
</row>
<row id="V4L2-PIX-FMT-VP8">
<entry><constant>V4L2_PIX_FMT_VP8</constant></entry>
- <entry>'VP8'</entry>
+ <entry>'VP80'</entry>
<entry>VP8 video elementary stream.</entry>
</row>
</tbody>