NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'

* commit '4d58e4cb4ca8e04317fecea432ea3272a445877c':
  Rename ffserver to avserver.
  Rename ffprobe to avprobe.
  Rename ffplay to avplay.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-08-10 16:28:12 +02:00
commit e2cc331124
2 changed files with 4 additions and 4 deletions

View File

@ -2954,7 +2954,7 @@ static const OptionDef options[] = {
static void show_usage(void) static void show_usage(void)
{ {
printf("Simple media player\n"); printf("Simple media player\n");
printf("usage: ffplay [options] input_file\n"); printf("usage: %s [options] input_file\n", program_name);
printf("\n"); printf("\n");
} }
@ -3019,7 +3019,7 @@ int main(int argc, char **argv)
if (!input_filename) { if (!input_filename) {
show_usage(); show_usage();
fprintf(stderr, "An input file must be specified\n"); fprintf(stderr, "An input file must be specified\n");
fprintf(stderr, "Use -h to get full help or, even better, run 'man ffplay'\n"); fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
exit(1); exit(1);
} }

View File

@ -330,7 +330,7 @@ static int probe_file(const char *filename)
static void show_usage(void) static void show_usage(void)
{ {
printf("Simple multimedia streams analyzer\n"); printf("Simple multimedia streams analyzer\n");
printf("usage: ffprobe [OPTIONS] [INPUT_FILE]\n"); printf("usage: %s [OPTIONS] [INPUT_FILE]\n", program_name);
printf("\n"); printf("\n");
} }
@ -412,7 +412,7 @@ int main(int argc, char **argv)
if (!input_filename) { if (!input_filename) {
show_usage(); show_usage();
fprintf(stderr, "You have to specify one input file.\n"); fprintf(stderr, "You have to specify one input file.\n");
fprintf(stderr, "Use -h to get full help or, even better, run 'man ffprobe'.\n"); fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'.\n", program_name);
exit(1); exit(1);
} }