Rename --service option to --input-service.

ChangeLog

@@ -1,5 +1,5 @@
 xxxx-xx-xx : Version next
- * Add --service option, to choose service id (program) in MPTS input.
+ * Add --input-service option, to choose service id (program) in MPTS input.
 
 2011-11-18 : Version 4.0
  * Set CAMD sockets NODELAY to avoid OSCAM errors when many packets are sent.

tsdecrypt.1

@@ -68,10 +68,10 @@ stream over UDP multicast.
 \fB\-z\fR, \fB\-\-input\-ignore\-disc\fR
 Do not report input discontinuity or RTP discontinuity errors.
 .TP
-\fB\-M\fR, \fB\-\-service\fR <service_id>
+\fB\-M\fR, \fB\-\-input\-service\fR <service_id>
 Choose the service id. This option must be used when the input is MPTS
 in order to select the correct service (program). If the input is MPTS
-and \fB\-\-service\fR is not used, tsdecrypt chooses the last service
+and \fB\-\-input\-service\fR is not used, tsdecrypt chooses the last service
 listed in PAT.
 .TP
 .SH OUTPUT OPTIONS

tsdecrypt.c

@@ -65,7 +65,7 @@ static const struct option long_options[] = {
 	{ "input",				required_argument, NULL, 'I' },
 	{ "input-rtp",			no_argument,       NULL, 'R' },
 	{ "input-ignore-disc",	no_argument,       NULL, 'z' },
-	{ "service",			required_argument, NULL, 'M' },
+	{ "input-service",		required_argument, NULL, 'M' },
 
 	{ "output",				required_argument, NULL, 'O' },
 	{ "output-intf",		required_argument, NULL, 'o' },
@@ -119,7 +119,7 @@ static void show_help(struct ts *ts) {
 	printf("                            .    -I -              (read from stdin) (default)\n");
 	printf(" -R --input-rtp             | Enable RTP input\n");
 	printf(" -z --input-ignore-disc     | Do not report discontinuty errors in input.\n");
-	printf(" -M --service <service_id>  | Choose service id when input is MPTS.\n");
+	printf(" -M --input-service <srvid> | Choose service id when input is MPTS.\n");
 	printf("\n");
 	printf("Output options:\n");
 	printf(" -O --output <dest>         | Where to send output. File or multicast address.\n");