Author: voroshil Date: Thu Jun 28 20:36:05 2007 New Revision: 23687 Log: Implemented tv://[<channel>][/<input_id>] url syntax to allow users start watching from S-Video or Composite input without touching '-tv input=' option. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Added: trunk/stream/tvi_vbi.c Modified: trunk/stream/stream_tv.c Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 (original) +++ trunk/DOCS/man/en/mplayer.1 Thu Jun 28 20:36:05 2007 @@ -70,7 +70,7 @@ vcd://track[/device] . .br .B mplayer -tv://[channel] +tv://[channel][/input_id] [options] . .br @@ -1728,7 +1728,8 @@ Can be used with \-vid and \-aid. This option tunes various properties of the TV capture module. For watching TV with MPlayer, use 'tv://' or 'tv://<channel_number>' or even 'tv://<channel_name> (see option channels for channel_name below) -as a movie URL. +as a movie URL. You can also use 'tv:///<input_id>' to start watching +movie from Composite or S-Video input (see option input for details). .sp 1 Available options are: .RSs