Make XVMC compilation depend on HAVE_XVMC, not HAVE_XVMC_ACCEL.

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 7acd61b14e08cd017b896475de95713111646d45..3eb9c18ecd9b6d01f7cca9c515047cbecf80de30 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -24,13 +24,13 @@
 #include <errno.h>
 #include <math.h>
 
+#include "config.h"
 #include "avformat.h"
 #include "avfilter.h"
 #include "avdevice.h"
 #include "cmdutils.h"
 #include "avstring.h"
 #include "version.h"
-#include "config.h"
 
 #undef exit
 
@@ -52,6 +52,17 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
     exit(1);
 }
 
+int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration)
+{
+    int64_t us = parse_date(timestr, is_duration);
+    if (us == INT64_MIN) {
+        fprintf(stderr, "Invalid %s specification for %s: %s\n",
+                is_duration ? "duration" : "date", context, timestr);
+        exit(1);
+    }
+    return us;
+}
+
 void show_help_options(const OptionDef *options, const char *msg, int mask, int value)
 {
     const OptionDef *po;
@@ -128,7 +139,7 @@ unknown_opt:
             } else if (po->flags & OPT_INT64) {
                 *po->u.int64_arg = parse_number_or_die(opt+1, arg, OPT_INT64, INT64_MIN, INT64_MAX);
             } else if (po->flags & OPT_FLOAT) {
-                *po->u.float_arg = parse_number_or_die(opt+1, arg, OPT_FLOAT, -INFINITY, INFINITY);
+                *po->u.float_arg = parse_number_or_die(opt+1, arg, OPT_FLOAT, -1.0/0.0, 1.0/0.0);
             } else if (po->flags & OPT_FUNC2) {
                 if(po->u.func2_arg(opt+1, arg)<0)
                     goto unknown_opt;
@@ -159,12 +170,12 @@ void print_error(const char *filename, int err)
         fprintf(stderr, "%s: Unknown format\n", filename);
         break;
     case AVERROR(EIO):
-        fprintf(stderr, "%s: I/O error occured\n"
+        fprintf(stderr, "%s: I/O error occurred\n"
                 "Usually that means that input file is truncated and/or corrupted.\n",
                 filename);
         break;
     case AVERROR(ENOMEM):
-        fprintf(stderr, "%s: memory allocation error occured\n", filename);
+        fprintf(stderr, "%s: memory allocation error occurred\n", filename);
         break;
     case AVERROR(ENOENT):
         fprintf(stderr, "%s: no such file or directory\n", filename);