RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 22:10:34 +00:00
Code Issues Projects Releases Wiki Activity

avprobe/avconv: fix tentative declaration compile errors on MSVS.

Browse Source
This commit is contained in:
Ronald S. Bultje 2012-07-26 04:23:23 +00:00
parent c83f44dba1
commit dcb7ef5483
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
avconv.c
View File

@ -104,7 +104,7 @@ typedef struct MetadataMap {
int index; ///< stream/chapter/program number int index; ///< stream/chapter/program number
} MetadataMap; } MetadataMap;
static const OptionDef options[]; static const OptionDef *options;
static int video_discard = 0; static int video_discard = 0;
static int same_quant = 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) #define OFFSET(x) offsetof(OptionsContext, x)
static const OptionDef options[] = { static const OptionDef real_options[] = {
/* main options */ /* main options */
#include "cmdutils_common_opts.h" #include "cmdutils_common_opts.h"
{ "f", HAS_ARG | OPT_STRING | OPT_OFFSET, {.off = OFFSET(format)}, "force format", "fmt" }, { "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 }; OptionsContext o = { 0 };
int64_t ti; int64_t ti;
options = real_options;
reset_options(&o); reset_options(&o);
av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_flags(AV_LOG_SKIP_REPEATED);

5
avprobe.c
View File

@ -44,7 +44,7 @@ static int use_byte_value_binary_prefix = 0;
static int use_value_sexagesimal_format = 0; static int use_value_sexagesimal_format = 0;
/* globals */ /* globals */
static const OptionDef options[]; static const OptionDef *options;
/* AVprobe context */ /* AVprobe context */
static const char *input_filename; static const char *input_filename;
@ -887,7 +887,7 @@ static void opt_pretty(void)
use_value_sexagesimal_format = 1; use_value_sexagesimal_format = 1;
} }
static const OptionDef options[] = { static const OptionDef real_options[] = {
#include "cmdutils_common_opts.h" #include "cmdutils_common_opts.h"
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "format" }, { "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" }, { "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) if (!buffer)
exit(1); exit(1);
options = real_options;
parse_loglevel(argc, argv, options); parse_loglevel(argc, argv, options);
av_register_all(); av_register_all();
avformat_network_init(); avformat_network_init();