* Various utilities for command line tools
* Copyright (c) 2000-2003 Fabrice Bellard
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define HAVE_AV_CONFIG_H
-#include "avformat.h"
-#include "common.h"
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "avformat.h"
#include "cmdutils.h"
+#include "avstring.h"
+
+#undef exit
void show_help_options(const OptionDef *options, const char *msg, int mask, int value)
{
printf("%s", msg);
first = 0;
}
- pstrcpy(buf, sizeof(buf), po->name);
+ av_strlcpy(buf, po->name, sizeof(buf));
if (po->flags & HAS_ARG) {
- pstrcat(buf, sizeof(buf), " ");
- pstrcat(buf, sizeof(buf), po->argname);
+ av_strlcat(buf, " ", sizeof(buf));
+ av_strlcat(buf, po->argname, sizeof(buf));
}
printf("-%-17s %s\n", buf, po->help);
}
return po;
}
-void parse_options(int argc, char **argv, const OptionDef *options)
+void parse_options(int argc, char **argv, const OptionDef *options,
+ void (* parse_arg_function)(const char*))
{
const char *opt, *arg;
- int optindex;
+ int optindex, handleoptions=1;
const OptionDef *po;
/* parse options */
while (optindex < argc) {
opt = argv[optindex++];
- if (opt[0] == '-' && opt[1] != '\0') {
+ if (handleoptions && opt[0] == '-' && opt[1] != '\0') {
+ if (opt[1] == '-' && opt[2] == '\0') {
+ handleoptions = 0;
+ continue;
+ }
po= find_option(options, opt + 1);
if (!po->name)
po= find_option(options, "default");
*po->u.int_arg = 1;
} else if (po->flags & OPT_INT) {
*po->u.int_arg = atoi(arg);
+ } else if (po->flags & OPT_INT64) {
+ *po->u.int64_arg = strtoll(arg, (char **)NULL, 10);
} else if (po->flags & OPT_FLOAT) {
*po->u.float_arg = atof(arg);
} else if (po->flags & OPT_FUNC2) {
if(po->u.func2_arg(opt+1, arg)<0)
goto unknown_opt;
} else {
- po->u.func_arg(arg);
+ po->u.func_arg(arg);
}
} else {
- parse_arg_file(opt);
+ if (parse_arg_function)
+ parse_arg_function(opt);
}
}
}
case AVERROR_NOFMT:
fprintf(stderr, "%s: Unknown format\n", filename);
break;
- case AVERROR_IO:
+ case AVERROR(EIO):
fprintf(stderr, "%s: I/O error occured\n"
- "Usually that means that input file is truncated and/or corrupted.\n",
- filename);
+ "Usually that means that input file is truncated and/or corrupted.\n",
+ filename);
break;
- case AVERROR_NOMEM:
+ case AVERROR(ENOMEM):
fprintf(stderr, "%s: memory allocation error occured\n", filename);
break;
+ case AVERROR(ENOENT):
+ fprintf(stderr, "%s: no such file or directory\n", filename);
+ break;
default:
fprintf(stderr, "%s: Error while opening file\n", filename);
break;
}
}
+
+void show_license(void)
+{
+#ifdef CONFIG_GPL
+ printf(
+ "FFmpeg is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+ "the Free Software Foundation; either version 2 of the License, or\n"
+ "(at your option) any later version.\n"
+ "\n"
+ "FFmpeg is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ "GNU General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU General Public License\n"
+ "along with FFmpeg; if not, write to the Free Software\n"
+ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
+ );
+#else
+ printf(
+ "FFmpeg is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU Lesser General Public\n"
+ "License as published by the Free Software Foundation; either\n"
+ "version 2.1 of the License, or (at your option) any later version.\n"
+ "\n"
+ "FFmpeg is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
+ "Lesser General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU Lesser General Public\n"
+ "License along with FFmpeg; if not, write to the Free Software\n"
+ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
+ );
+#endif
+}
projects / ffmpeg / blobdiff