From dcb7ef5483f26a7f20eee048821916f051216d62 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Thu, 26 Jul 2012 04:23:23 +0000
Subject: avprobe/avconv: fix tentative declaration compile errors on MSVS.

---
 avconv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'avconv.c')

diff --git a/avconv.c b/avconv.c
index 7142ab41e9..439672a346 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);
-- 
cgit v1.2.3