aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-01 23:10:27 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-01 23:10:27 +0000
commit07a70b3825b10e314fbf2ffa45d162b7824a1ca4 (patch)
tree130fd51ef3de50915d3cbd03f41c4f62c03e5474
parent58621b8d5b19dee7ee17d64342e644f6ac57dc68 (diff)
downloadffmpeg-07a70b3825b10e314fbf2ffa45d162b7824a1ca4.tar.gz
Add a check for checking if more than one input file is provided to
ffplay, make it complain and abort in that case as just one input file is currently supported. Originally committed as revision 22139 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ffplay.c b/ffplay.c
index 16a4258334..b6b185e00d 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2671,6 +2671,11 @@ static void show_help(void)
static void opt_input_file(const char *filename)
{
+ if (input_filename) {
+ fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
+ filename, input_filename);
+ exit(1);
+ }
if (!strcmp(filename, "-"))
filename = "pipe:";
input_filename = filename;