From 8f2ccba71bb44cceb43436cbbabd6e42fc71925c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 22 Aug 2017 19:08:07 +0200 Subject: 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. --- options/options.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'options/options.c') 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, -- cgit v1.2.3