From c9088fff86068f3fc983ec6944e648cdc3ebe0a3 Mon Sep 17 00:00:00 2001 From: wm4 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.) --- video/decode/vd_lavc.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'video/decode/vd_lavc.c') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 4959324509..4922f57387 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -71,6 +71,8 @@ static enum PixelFormat get_format_hwdec(struct AVCodecContext *avctx, static void uninit(struct sh_video *sh); +#define OPT_BASE_STRUCT struct MPOpts + const m_option_t lavc_decode_opts_conf[] = { OPT_INTRANGE("bug", lavc_param.workaround_bugs, 0, -1, 999999), OPT_FLAG("gray", lavc_param.gray, 0), -- cgit v1.2.3