# HG changeset patch
# User nicolas
# Date 1050858537 0
# Node ID ad081e771ada2f58303086a7cbb6412e5a1c373f
# Parent  b552e7939ca295ccbdbe7516381e135dfccc67d9
patch by Albeu + update of matrox_tvout url

diff -r b552e7939ca2 -r ad081e771ada DOCS/xml/en/edl.xml
--- a/DOCS/xml/en/edl.xml	Sun Apr 20 15:09:19 2003 +0000
+++ b/DOCS/xml/en/edl.xml	Sun Apr 20 17:08:57 2003 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<sect1 id="edl" xreflabel="TV input">
+<sect1 id="edl" xreflabel="Edit Decision Lists (EDL)">
 <title>Edit Decision Lists (EDL)</title>
 
 <para>
diff -r b552e7939ca2 -r ad081e771ada DOCS/xml/en/tvinput.xml
--- a/DOCS/xml/en/tvinput.xml	Sun Apr 20 15:09:19 2003 +0000
+++ b/DOCS/xml/en/tvinput.xml	Sun Apr 20 17:08:57 2003 +0000
@@ -36,7 +36,7 @@
 <listitem>
 <para>
 Use the <option>channels</option> option. An example:
-<screen>-tv on:channels=26-MTV1,23-TV2</screen>
+<screen>-tv channels=26-MTV1,23-TV2</screen>
 Explanation: using this option, only the 26 and 23 channels will be usable,
 and there will be a nice OSD text upon channel switching, displaying the
 channel's name. Spaces in the channel name must be replaced by the
@@ -152,7 +152,7 @@
 <para>
 Dummy output, to AAlib :)
 <screen>
-mplayer -tv on:driver=dummy:width=640:height=480 -vo aa<!--
+mplayer -tv driver=dummy:width=640:height=480 -vo aa tv://<!--
 --></screen>
 </para>
 </informalexample>
@@ -161,7 +161,7 @@
 <para>
 Input from standard V4L:
 <screen>
-mplayer -tv on:driver=v4l:width=640:height=480:outfmt=i420 -vc rawi420 -vo xv<!--
+mplayer -tv driver=v4l:width=640:height=480:outfmt=i420 -vc rawi420 -vo xv tv://<!--
 --></screen>
 </para>
 </informalexample>
@@ -173,10 +173,10 @@
 algorithm. Audio is compressed with a constant bitrate of 64kbps, using
 LAME codec. This setup is suitable for capturing movies.
 <screen>
-     mencoder -tv on:driver=v4l:width=768:height=576 \
+     mencoder -tv driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=900 \
      -oac mp3lame -lameopts cbr:br=64 \
-     -vf crop=720:544:24:16,pp=lb -o output.avi
+     -vf crop=720:544:24:16,pp=lb -o output.avi tv://
 </screen>
 </para>
 </informalexample>
@@ -189,10 +189,10 @@
 low bitrate even at the expense of the quality. This can be used for
 capturing long TV series, where the video quality isn't so important.
 <screen>
-     mencoder -tv on:driver=v4l:width=768:height=576 \
+     mencoder -tv driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=350:vhq:vqmax=31:keyint=300 \
      -oac mp3lame -lameopts cbr:br=48 \
-     -vf crop=720:540:24:18,pp=tn/lb,scale=384:288 -sws 1 -o output.avi
+     -vf crop=720:540:24:18,pp=tn/lb,scale=384:288 -sws 1 -o output.avi tv://
 </screen>
 It's also possible to specify smaller image dimensions in the <option>-tv</option>
 option and omit the software scaling but this approach uses the maximum available
diff -r b552e7939ca2 -r ad081e771ada DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml	Sun Apr 20 15:09:19 2003 +0000
+++ b/DOCS/xml/en/video.xml	Sun Apr 20 17:08:57 2003 +0000
@@ -2041,7 +2041,7 @@
 
 <para>
 The necessary kernel patch and the detailed howto is downloadable from
-<ulink url="http://www3.sympatico.ca/dan.eriksen/matrox_tvout/"/>
+<ulink url="http://www.bglug.ca/matrox_tvout/"/>
 </para>
 </sect4>