diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-05 08:42:18 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-05 08:42:18 -0300 |
commit | b6d0c4b9b47910a71f4fcec532cd503f319da0d8 (patch) | |
tree | 5fdbc6612d7ba83dbcb34585472832ae1bd05e8f /v4l2-spec | |
parent | 3d2b4c935e8804f2ed232614079f41ab6360aad2 (diff) | |
parent | a98b15d8435d3661c93a5e73eca17f300508a11c (diff) | |
download | mediapointer-dvb-s2-b6d0c4b9b47910a71f4fcec532cd503f319da0d8.tar.gz mediapointer-dvb-s2-b6d0c4b9b47910a71f4fcec532cd503f319da0d8.tar.bz2 |
merge: http://jusst.de/hg/v4l-dvb/rev/da67609aae86
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/Makefile | 2 | ||||
-rw-r--r-- | v4l2-spec/v4l2.sgml | 2 | ||||
-rw-r--r-- | v4l2-spec/vidioc-g-tuner.sgml | 4 |
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 |