conditional compilation of ratecontrol.c

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index cc139c04051f1ea5b0efc64dfe69c2bb82c2d267..4d153b79ba8221483472a6b031c5d3b8ca9b38ed 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -18,11 +18,16 @@
  * 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)
 {
@@ -37,10 +42,10 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int
                 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);
         }
@@ -59,7 +64,7 @@ static const OptionDef* find_option(const OptionDef *po, const char *name){
 void parse_options(int argc, char **argv, const OptionDef *options)
 {
     const char *opt, *arg;
-    int optindex;
+    int optindex, handleoptions=1;
     const OptionDef *po;
 
     /* parse options */
@@ -67,7 +72,11 @@ void parse_options(int argc, char **argv, const OptionDef *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");
@@ -92,6 +101,8 @@ unknown_opt:
                 *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) {
@@ -130,6 +141,9 @@ void print_error(const char *filename, int err)
     case AVERROR_NOMEM:
         fprintf(stderr, "%s: memory allocation error occured\n", filename);
         break;
+    case AVERROR_NOENT:
+        fprintf(stderr, "%s: no such file or directory\n", filename);
+        break;
     default:
         fprintf(stderr, "%s: Error while opening file\n", filename);
         break;