diff options
| author | wm4 <wm4@nowhere> | 2017-08-22 19:08:07 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-08-22 19:08:07 +0200 |
| commit | 8f2ccba71bb44cceb43436cbbabd6e42fc71925c (patch) | |
| tree | ae9fd1fd508a505607f7374096b68703d336b2a4 /options | |
| parent | 0c88b661f9c5025cd86d0445d5a993f00224842a (diff) | |
| download | mpv-8f2ccba71bb44cceb43436cbbabd6e42fc71925c.tar.bz2 mpv-8f2ccba71bb44cceb43436cbbabd6e42fc71925c.tar.xz | |
video: change --deinterlace behavior
This removes all GPL only code from it, and that's the whole purpose.
Also happens to be much simpler.
The "deinterlace" option still sort of exists, but only as runtime
changeable option. The main change in behavior is that the property will
not report back the actual deint state. Or in other words, if inserting
or initializing the filter fails, the deinterlace property will still
return "yes". This is in line with most recent behavior changes to
properties and options.
Diffstat (limited to 'options')
| -rw-r--r-- | options/m_option.h | 3 | ||||
| -rw-r--r-- | options/options.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/options/m_option.h b/options/m_option.h index cfc5f6bb15..ad6dfe6698 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -397,7 +397,8 @@ struct m_option { // The following are also part of the M_OPT_* flags, and are used to update // certain groups of options. #define UPDATE_OPT_FIRST (1 << 7) -#define UPDATE_TERM (1 << 7) // terminal options +#define UPDATE_TERM (1 << 7) // terminal options +#define UPDATE_DEINT (1 << 8) // --deinterlace #define UPDATE_OSD (1 << 10) // related to OSD rendering #define UPDATE_BUILTIN_SCRIPTS (1 << 11) // osc/ytdl #define UPDATE_IMGPAR (1 << 12) // video image params overrides diff --git a/options/options.c b/options/options.c index 258cba0d31..355d482543 100644 --- a/options/options.c +++ b/options/options.c @@ -423,10 +423,7 @@ const m_option_t mp_opts[] = { OPT_SETTINGSLIST("vf-defaults", vf_defs, 0, &vf_obj_list, ), OPT_SETTINGSLIST("vf", vf_settings, 0, &vf_obj_list, ), - OPT_CHOICE("deinterlace", deinterlace, 0, - ({"auto", -1}, - {"no", 0}, - {"yes", 1})), + OPT_FLAG("deinterlace", deinterlace, UPDATE_DEINT), OPT_STRING("ad", audio_decoders, 0), OPT_STRING("vd", video_decoders, 0), @@ -835,7 +832,6 @@ const struct MPOpts mp_default_opts = { .audio_driver_list = NULL, .audio_decoders = NULL, .video_decoders = NULL, - .deinterlace = -1, .softvol = SOFTVOL_AUTO, .softvol_max = 130, .softvol_volume = 100, |