summaryrefslogtreecommitdiff
path: root/v4l2-spec
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-25 10:30:47 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-25 10:30:47 -0300
commit7db75cc5ef77d21e53de84182dddeddfb20c5c2f (patch)
tree7eaa3cf61a6e67c3d2032df808def1239845a643 /v4l2-spec
parent2da5cdaefead4beb36671ca025826f9e8deadef4 (diff)
parent8ac09cada9b0181fface833be0b9105cb0324717 (diff)
downloadmediapointer-dvb-s2-7db75cc5ef77d21e53de84182dddeddfb20c5c2f.tar.gz
mediapointer-dvb-s2-7db75cc5ef77d21e53de84182dddeddfb20c5c2f.tar.bz2
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-spec')
-rw-r--r--v4l2-spec/Makefile2
-rw-r--r--v4l2-spec/v4l2.sgml2
-rw-r--r--v4l2-spec/vidioc-g-tuner.sgml4
3 files changed, 4 insertions, 4 deletions
diff --git a/v4l2-spec/Makefile b/v4l2-spec/Makefile
index e39136569..7a19924d4 100644
--- a/v4l2-spec/Makefile
+++ b/v4l2-spec/Makefile
@@ -1,5 +1,5 @@
# Also update in v4l2.sgml!
-VERSION = 0.25
+VERSION = 0.26
SHELL=/bin/bash
SGMLS = \
diff --git a/v4l2-spec/v4l2.sgml b/v4l2-spec/v4l2.sgml
index a6cbae2bf..470793d29 100644
--- a/v4l2-spec/v4l2.sgml
+++ b/v4l2-spec/v4l2.sgml
@@ -25,7 +25,7 @@
<book id="v4l2spec">
<bookinfo>
<title>Video for Linux Two API Specification</title>
- <subtitle>Revision 0.25</subtitle>
+ <subtitle>Revision 0.26</subtitle>
<authorgroup>
<author>
diff --git a/v4l2-spec/vidioc-g-tuner.sgml b/v4l2-spec/vidioc-g-tuner.sgml
index 6285c18de..d5d379838 100644
--- a/v4l2-spec/vidioc-g-tuner.sgml
+++ b/v4l2-spec/vidioc-g-tuner.sgml
@@ -375,8 +375,8 @@ language.</entry>
<entry>1</entry>
<entry><para>Play stereo audio. When the tuner receives
bilingual audio it may play different languages on the left and right
-channel or the primary language on both channels. behave as in mono
-mode.</para><para>Playing different languages in this mode is
+channel or the primary language is played on both channels.</para><para>Playing
+different languages in this mode is
deprecated. New drivers should do this only in
<constant>MODE_LANG1_LANG2</constant>.</para><para>When the tuner
receives no stereo signal or does not support stereo reception the