On 07/28/2012 08:53 PM, Måns Rullgård wrote: > "Ronald S. Bultje " <[email protected]> writes: > >> Module: libav >> Branch: master >> Commit: dcb7ef5483f26a7f20eee048821916f051216d62 >> >> Author: Ronald S. Bultje <[email protected]> >> Committer: Ronald S. Bultje <[email protected]> >> Date: Thu Jul 26 04:23:23 2012 +0000 >> >> avprobe/avconv: fix tentative declaration compile errors on MSVS. >> >> --- >> >> avconv.c | 5 +++-- >> avprobe.c | 5 +++-- >> 2 files changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/avconv.c b/avconv.c >> index 7142ab4..439672a 100644 >> --- a/avconv.c >> +++ b/avconv.c >> @@ -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); >> diff --git a/avprobe.c b/avprobe.c >> index 8e93d05..aa7dae4 100644 >> --- a/avprobe.c >> +++ b/avprobe.c >> @@ -44,7 +44,7 @@ static int use_byte_value_binary_prefix = 0; >> static int use_value_sexagesimal_format = 0; >> >> /* globals */ >> -static const OptionDef options[]; >> +static const OptionDef *options; >> >> /* AVprobe context */ >> static const char *input_filename; >> @@ -887,7 +887,7 @@ static void opt_pretty(void) >> use_value_sexagesimal_format = 1; >> } >> >> -static const OptionDef options[] = { >> +static const OptionDef real_options[] = { >> #include "cmdutils_common_opts.h" >> { "f", HAS_ARG, {(void*)opt_format}, "force format", "format" }, >> { "of", HAS_ARG, {(void*)&opt_output_format}, "output the document >> either as ini or json", "output_format" }, >> @@ -927,6 +927,7 @@ int main(int argc, char **argv) >> if (!buffer) >> exit(1); >> >> + options = real_options; > > Did I mention this is ugly as fuck? > I tried to get something slightly less horrible but then you have the prototype for the help function and some reordering.
lu -- Luca Barbato Gentoo/linux http://dev.gentoo.org/~lu_zero _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
