diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
commit | fb09531720a4aa2dfa97e5a9a246a453b6278fd2 (patch) | |
tree | 61525c3a8ddb419d3838a26e488fc3659079bbcd /contrib/ffmpeg/cmdutils.c | |
parent | 294d01046724e28b7193bcb65bf2a0391b0135b6 (diff) | |
download | xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.gz xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.bz2 |
Sync with a more recent version of FFmpeg.
Diffstat (limited to 'contrib/ffmpeg/cmdutils.c')
-rw-r--r-- | contrib/ffmpeg/cmdutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |