From fb09531720a4aa2dfa97e5a9a246a453b6278fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 3 Apr 2007 01:18:24 +0200
Subject: Sync with a more recent version of FFmpeg.

---
 contrib/ffmpeg/cmdutils.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'contrib/ffmpeg/cmdutils.c')

diff --git a/contrib/ffmpeg/cmdutils.c b/contrib/ffmpeg/cmdutils.c
index 2c53d90da..d5095cec8 100644
--- a/contrib/ffmpeg/cmdutils.c
+++ b/contrib/ffmpeg/cmdutils.c
@@ -24,6 +24,8 @@
 
 #include "cmdutils.h"
 
+#undef exit
+
 void show_help_options(const OptionDef *options, const char *msg, int mask, int value)
 {
     const OptionDef *po;
@@ -96,6 +98,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 = atoll(arg);
             } else if (po->flags & OPT_FLOAT) {
                 *po->u.float_arg = atof(arg);
             } else if (po->flags & OPT_FUNC2) {
-- 
cgit v1.2.3