summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-01 11:27:59 +0100
committerwm4 <wm4@nowhere>2013-03-01 11:27:59 +0100
commitc9088fff86068f3fc983ec6944e648cdc3ebe0a3 (patch)
tree7612c7b65517359e1e64c37dd4e7e429ecfa054c /demux
parent95b8585d76bf8b719dd9b82d305e169971f73570 (diff)
downloadmpv-c9088fff86068f3fc983ec6944e648cdc3ebe0a3.tar.bz2
mpv-c9088fff86068f3fc983ec6944e648cdc3ebe0a3.tar.xz
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.)
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c2
1 files changed, 2 insertions, 0 deletions
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),