- re-added the old and (no more used) option -tsfastparse with a

CONF_TYPE_PRINT
- option -tsprog <number> to specify the chosen program (-vid and -aid
still override the single stream pids)
patch by Nico <nsabbi@libero.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10689 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 15 insertions, 4 deletions

diff --git a/DOCS/en/mplayer.1 b/DOCS/en/mplayer.1
index 89518546a3..ffd2e4c845 100644
--- a/DOCS/en/mplayer.1
+++ b/DOCS/en/mplayer.1
@@ -548,8 +548,10 @@ this option.
 .TP
 .B \-aid <id> (also see \-alang option)
 Select audio channel [MPEG: 0\-31 AVI/\:OGM: 1\-99 ASF/\:RM: 0\-127
-VOB(AC3): 128\-159 VOB(LPCM): 160\-191]
+VOB(AC3): 128\-159 VOB(LPCM): 160\-191 MPEG-TS 17\-8190].
 MPlayer prints the available IDs when running in verbose (-v) mode.
+When playing an MPEG-TS stream, MPlayer/Mencoder will use the first program 
+(if present) with the chosen audio stream.
 .TP
 .B \-alang <two letter\ country\ code> (also see \-aid option)
 Works only for DVD playback.
@@ -886,6 +888,11 @@ seeks to 1\ hour 10\ min
 .PD 1
 .
 .TP
+.B \-tsprog <1\-65534>
+When playing an MPEG-TS stream, you can specify with this option which  
+program (if present) you want to play. Can be used with \-vid and \-aid.
+.
+.TP
 .B \-tv <option1:option2:...>
 This option tunes various properties of tv-capture module.
 For watching TV with MPlayer, use 'tv://' or 'tv://<channel_number>' 
@@ -1023,7 +1030,9 @@ choose the quality of the jpeg compression
 Specify user name for http authentication.
 .TP
 .B \-vid <id>
-Select video channel [MPG: 0\-15 ASF: 0\-255].
+Select video channel [MPG: 0\-15 ASF: 0\-255 MPEG-TS: 17\-8190].
+When playing an MPEG-TS stream, MPlayer/Mencoder will use the first program 
+(if present) with the chosen video stream.
 .TP
 .B \-vivo <sub\-options> (DEBUG CODE)
 Force audio parameters for the .vivo demuxer (for debugging purposes).
diff --git a/cfg-common.h b/cfg-common.h
index 857b341f53..fd28689f2a 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -181,7 +181,9 @@
 
         {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
         {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
-	{"tsfastparse", &ts_fastparse, CONF_TYPE_INT, 0, 0, 0, NULL},
+	{"tsfastparse", "-tsfastparse isn't a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
+},
+	{"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},
 
 	// draw by slices or whole frame (useful with libmpeg2/libavcodec)
 	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -282,7 +284,7 @@ extern m_option_t cdda_opts[];
 extern char* audio_stream;
 extern char* sub_stream;
 extern int demuxer_type, audio_demuxer_type, sub_demuxer_type;
-extern int ts_fastparse;
+extern int ts_prog;
 
 #include "libmpdemux/tv.h"