[Mplayer-cvslog] CVS: main/DOCS mplayer.1,1.292,1.293

[Jindrich Makovicka CVS]

Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv23809/DOCS

Modified Files:
	mplayer.1 
Log Message:
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)

Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- mplayer.1	28 Dec 2002 15:03:22 -0000	1.292
+++ mplayer.1	28 Dec 2002 22:57:38 -0000	1.293
@@ -666,6 +666,7 @@
 Specify other input than the default 0 (Television) (see output for a list)
 .IPs freq=<value>
 Specify the frequency to set the tuner to (e.g.\& 511.250).
+Not compatible with channels parameter.
 .IPs outfmt=<value>
 output format of the tuner (yv12, rgb32, rgb24, rgb16, rgb15, uyvy, yuy2,
 i420)
@@ -682,6 +683,13 @@
 Set tuner to <value> channel.
 .IPs chanlist=<value>
 available: europe-east, europe-west, us-bcast, us-cable, etc
+.IPs channels=<channel>-<name>,<channel>-<name>,...
+Set names for channels. Use _ for spaces in names (or play with quoting ;-).
+The channel names will then be written using OSD, and the commands tv_step_channel,
+tv_set_channel and tv_last_channel will then be usable using a remote (see. lirc).
+Not compatible with frequency parameter.
+Warning : The channel number will then be the position in the 'channels' list,
+beginning with 1. Ie. use tv://1, tv://2, tv_set_channel 1, tv_set_channel 2, etc.
 .IPs audiorate=<value>
 set audio capture bitrate
 .IPs forceaudio