Remove unnecessary calls to show_help(), make ffmpeg/ffplay print a
specific error message instead. Originally committed as revision 15868 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
40b509b36b
commit
7a7da6b42f
4
ffmpeg.c
4
ffmpeg.c
@ -3874,10 +3874,6 @@ int main(int argc, char **argv)
|
|||||||
sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
|
sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
|
||||||
|
|
||||||
show_banner();
|
show_banner();
|
||||||
if (argc <= 1) {
|
|
||||||
show_help();
|
|
||||||
av_exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* parse options */
|
/* parse options */
|
||||||
parse_options(argc, argv, options, opt_output_file);
|
parse_options(argc, argv, options, opt_output_file);
|
||||||
|
2
ffplay.c
2
ffplay.c
@ -2553,7 +2553,7 @@ int main(int argc, char **argv)
|
|||||||
parse_options(argc, argv, options, opt_input_file);
|
parse_options(argc, argv, options, opt_input_file);
|
||||||
|
|
||||||
if (!input_filename) {
|
if (!input_filename) {
|
||||||
show_help();
|
fprintf(stderr, "An input file must be specified\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user