diff options
author | wm4 <wm4@nowhere> | 2013-03-01 11:27:59 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-03-01 11:27:59 +0100 |
commit | c9088fff86068f3fc983ec6944e648cdc3ebe0a3 (patch) | |
tree | 7612c7b65517359e1e64c37dd4e7e429ecfa054c /video | |
parent | 95b8585d76bf8b719dd9b82d305e169971f73570 (diff) | |
download | mpv-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 'video')
-rw-r--r-- | video/decode/vd_lavc.c | 2 | ||||
-rw-r--r-- | video/image_writer.c | 1 | ||||
-rw-r--r-- | video/out/vo_image.c | 1 | ||||
-rw-r--r-- | video/out/vo_sdl.c | 1 | ||||
-rw-r--r-- | video/out/vo_vdpau.c | 1 |
5 files changed, 2 insertions, 4 deletions
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), diff --git a/video/image_writer.c b/video/image_writer.c index 98649c5c34..0ec949b36a 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -54,7 +54,6 @@ const struct image_writer_opts image_writer_opts_defaults = { .jpeg_baseline = 1, }; -#undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct image_writer_opts const struct m_sub_options image_writer_conf = { diff --git a/video/out/vo_image.c b/video/out/vo_image.c index d39df5851c..32ab26dafe 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -180,7 +180,6 @@ static int control(struct vo *vo, uint32_t request, void *data) return VO_NOTIMPL; } -#undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct priv const struct vo_driver video_out_image = diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 45486afbfd..5f1e4317ed 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -1014,7 +1014,6 @@ static int control(struct vo *vo, uint32_t request, void *data) return VO_NOTIMPL; } -#undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct priv const struct vo_driver video_out_sdl = { diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index e46e4639b6..6b35176bfb 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -1618,7 +1618,6 @@ static int control(struct vo *vo, uint32_t request, void *data) return VO_NOTIMPL; } -#undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct vdpctx const struct vo_driver video_out_vdpau = { |