diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-26 04:23:23 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-28 11:48:18 -0700 |
commit | dcb7ef5483f26a7f20eee048821916f051216d62 (patch) | |
tree | 4a70aad28f0c91e51a2aac1e3e3a9a882499458d /avconv.c | |
parent | c83f44dba11930744e167856b48fbc24a8ff0e63 (diff) | |
download | ffmpeg-dcb7ef5483f26a7f20eee048821916f051216d62.tar.gz |
avprobe/avconv: fix tentative declaration compile errors on MSVS.
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -104,7 +104,7 @@ typedef struct MetadataMap { int index; ///< stream/chapter/program number } MetadataMap; -static const OptionDef options[]; +static const OptionDef *options; static int video_discard = 0; static int same_quant = 0; @@ -4858,7 +4858,7 @@ static int opt_filter_complex(const char *opt, const char *arg) } #define OFFSET(x) offsetof(OptionsContext, x) -static const OptionDef options[] = { +static const OptionDef real_options[] = { /* main options */ #include "cmdutils_common_opts.h" { "f", HAS_ARG | OPT_STRING | OPT_OFFSET, {.off = OFFSET(format)}, "force format", "fmt" }, @@ -4975,6 +4975,7 @@ int main(int argc, char **argv) OptionsContext o = { 0 }; int64_t ti; + options = real_options; reset_options(&o); av_log_set_flags(AV_LOG_SKIP_REPEATED); |