diff options
-rw-r--r-- | core/cfg-mplayer.h | 2 | ||||
-rw-r--r-- | core/input/input.c | 2 | ||||
-rw-r--r-- | core/m_option.h | 2 | ||||
-rw-r--r-- | demux/demux_lavf.c | 2 | ||||
-rw-r--r-- | sub/sub.c | 1 | ||||
-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 |
10 files changed, 8 insertions, 7 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 22017f930b..651ec61a77 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -282,6 +282,8 @@ const m_option_t msgl_config[]={ extern const m_option_t lavc_decode_opts_conf[]; +#define OPT_BASE_STRUCT struct MPOpts + const m_option_t common_opts[] = { // ------------------------- common options -------------------- OPT_FLAG("quiet", quiet, CONF_GLOBAL), diff --git a/core/input/input.c b/core/input/input.c index 5d5e3f3a67..6419f28bc1 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -518,6 +518,8 @@ int async_quit_request; static int print_key_list(m_option_t *cfg, char *optname, char *optparam); static int print_cmd_list(m_option_t *cfg, char *optname, char *optparam); +#define OPT_BASE_STRUCT struct MPOpts + // Our command line options static const m_option_t input_conf[] = { OPT_STRING("conf", input.config_file, CONF_GLOBAL), diff --git a/core/m_option.h b/core/m_option.h index 5720b30b94..d06e189449 100644 --- a/core/m_option.h +++ b/core/m_option.h @@ -619,6 +619,4 @@ static inline void m_option_free(const m_option_t *opt, void *dst) .type = &m_option_type_subconfig_struct, \ .priv = (void*)&subconf) -#define OPT_BASE_STRUCT struct MPOpts - #endif /* MPLAYER_M_OPTION_H */ 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), @@ -65,7 +65,6 @@ static const const struct osd_style_opts osd_style_opts_def = { .margin_y = 10, }; -#undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct osd_style_opts const struct m_sub_options osd_style_conf = { .opts = (m_option_t[]) { 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 = { |