Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / Documentation / video4linux / cx2341x / fw-osd-api.txt

diff --git a/Documentation/video4linux/cx2341x/fw-osd-api.txt b/Documentation/video4linux/cx2341x/fw-osd-api.txt
index 0a602f3e601b1615ecb69e720e85c547e60f4f82..89c4601042c18009287725d61c8c4600d93f6f52 100644 (file)
--- a/Documentation/video4linux/cx2341x/fw-osd-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-osd-api.txt
@@ -21,7 +21,11 @@ Enum         66/0x42
 Description
        Query OSD format
 Result[0]
-       0=8bit index, 4=AlphaRGB 8:8:8:8
+       0=8bit index
+       1=16bit RGB 5:6:5
+       2=16bit ARGB 1:5:5:5
+       3=16bit ARGB 1:4:4:4
+       4=32bit ARGB 8:8:8:8
 
 -------------------------------------------------------------------------------
 
@@ -30,7 +34,11 @@ Enum         67/0x43
 Description
        Assign pixel format
 Param[0]
-       0=8bit index, 4=AlphaRGB 8:8:8:8
+       0=8bit index
+       1=16bit RGB 5:6:5
+       2=16bit ARGB 1:5:5:5
+       3=16bit ARGB 1:4:4:4
+       4=32bit ARGB 8:8:8:8
 
 -------------------------------------------------------------------------------