---

yaml --- r: 164130 b: refs/heads/master c: 4e5fee2 h: refs/heads/master v: v3
git-mirror · Sep 19, 2009 · 0e4a02d · 0e4a02d
1 parent 5ee578c
commit 0e4a02d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 453d63c6a1afff9aa7e83ac9c3a9dbd6254a1fcd
+refs/heads/master: 4e5fee2bc15bf1226783db5855c25ec8ebfb25ac
diff --git a/trunk/Documentation/DocBook/v4l/pixfmt.xml b/trunk/Documentation/DocBook/v4l/pixfmt.xml
@@ -777,6 +777,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm
 url="http://www.thedirks.org/winnov/">
 http://www.thedirks.org/winnov/</ulink></para></entry>
 	  </row>
+	  <row id="V4L2-PIX-FMT-TM6000">
+	    <entry><constant>V4L2_PIX_FMT_TM6000</constant></entry>
+	    <entry>'TM60'</entry>
+	    <entry><para>Used by Trident tm6000</para></entry>
+	  </row>
 	  <row id="V4L2-PIX-FMT-YYUV">
 	    <entry><constant>V4L2_PIX_FMT_YYUV</constant></entry>
 	    <entry>'YYUV'</entry>