diff options
author | wm4 <wm4@nowhere> | 2017-11-29 20:03:20 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-11-29 21:30:51 +0100 |
commit | 23d9dc5457c52408533c498c685ad9dd6fd2cee0 (patch) | |
tree | f653cbf00989d04b9513fcaa55ac33f54cc93a1d /options | |
parent | 03518c1a836fd8871d76c735c3a4842ce0416902 (diff) | |
download | mpv-23d9dc5457c52408533c498c685ad9dd6fd2cee0.tar.bz2 mpv-23d9dc5457c52408533c498c685ad9dd6fd2cee0.tar.xz |
video: remove automatic stereo3d filter insertion
The internal stereo3d filter was removed due to being GPL only, and due
to being a mess that somehow used libavfilter's filter. Without this
filter, it's hard to remove our internal stereo3d image attribute, so
even using libavfilter's stereo3d filter would not work too well (unless
someone fixes it and makes it able to use AVFrame metadata, which we
then could mirror in mp_image).
This was never well thought-through anyway, so just drop it. I think
some "downsampling" support would still make sense, maybe that can be
readded later.
Diffstat (limited to 'options')
-rw-r--r-- | options/m_option.h | 4 | ||||
-rw-r--r-- | options/options.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/options/m_option.h b/options/m_option.h index ac10ed9dd2..104fd9519c 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -638,10 +638,10 @@ extern const char m_option_path_separator; #define OPT_CHOICE_(optname, varname, flags, choices, ...) \ OPT_GENERAL(int, optname, varname, flags, M_CHOICES(choices), __VA_ARGS__) // Variant which takes a pointer to struct m_opt_choice_alternatives directly -#define OPT_CHOICE_C(optname, varname, flags, choices) \ +#define OPT_CHOICE_C(optname, varname, flags, choices, ...) \ OPT_GENERAL(int, optname, varname, flags, .priv = (void *) \ MP_EXPECT_TYPE(const struct m_opt_choice_alternatives*, choices), \ - .type = &m_option_type_choice) + .type = &m_option_type_choice, __VA_ARGS__) #define OPT_FLAGS(...) \ OPT_CHOICE_(__VA_ARGS__, .type = &m_option_type_flags) diff --git a/options/options.c b/options/options.c index e295afa9bc..d3e7bd2c34 100644 --- a/options/options.c +++ b/options/options.c @@ -566,7 +566,8 @@ const m_option_t mp_opts[] = { OPT_CHOICE_OR_INT("video-rotate", video_rotate, UPDATE_IMGPAR, 0, 359, ({"no", -1})), OPT_CHOICE_C("video-stereo-mode", video_stereo_mode, UPDATE_IMGPAR, - mp_stereo3d_names), + mp_stereo3d_names, + .deprecation_message = "mostly broken"), OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0, 0, 30000, ({"no", -1}, {"always", -2})), |