From c9088fff86068f3fc983ec6944e648cdc3ebe0a3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 1 Mar 2013 11:27:59 +0100
Subject: m_option: don't define OPT_BASE_STRUCT by default

OPT_BASE_STRUCT defines which struct the OPT_ macros (like OPT_INT etc.)
reference implicitly, since these macros take struct member names but no
struct type. Normally, only cfg-mplayer.h should need this, and other
places shouldn't be bothered with having to #undef it.

(Some files, like demux_lavf.c, still store their options in MPOpts. In
the long term, this should be removed, and handled like e.g. with VO
suboptions instead.)
---
 demux/demux_lavf.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'demux/demux_lavf.c')

diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 23495d0ed5..370d0cb17c 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -49,6 +49,8 @@
 #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
 #define PROBE_BUF_SIZE (2 * 1024 * 1024)
 
+#define OPT_BASE_STRUCT struct MPOpts
+
 const m_option_t lavfdopts_conf[] = {
     OPT_INTRANGE("probesize", lavfdopts.probesize, 0, 32, INT_MAX),
     OPT_STRING("format", lavfdopts.format, 0),
-- 
cgit v1.2.3