Replace a return of -1 with ENOMEM.

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 2c53d90daa3b451ff781fcd0d78d8172d9a16ba0..1c2f44ef3c2d6610229ddadb59135c6cdfa2e263 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);
         }
@@ -96,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) {
@@ -126,14 +133,17 @@ void print_error(const char *filename, int err)
     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);
         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;