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 /video/filter/vf.h | |
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 'video/filter/vf.h')
-rw-r--r-- | video/filter/vf.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index 8a9815078d..5146a4d15b 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -13,8 +13,6 @@ * * You should have received a copy of the GNU Lesser General Public * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - * - * Parts under HAVE_GPL are licensed under GNU General Public License. */ #ifndef MPLAYER_VF_H @@ -22,8 +20,6 @@ #include <stdbool.h> -#include "config.h" - #include "video/mp_image.h" #include "common/common.h" @@ -143,10 +139,6 @@ struct vf_chain { enum vf_ctrl { VFCTRL_SEEK_RESET = 1, // reset on picture and PTS discontinuities -#if HAVE_GPL - VFCTRL_SET_DEINTERLACE, // Set deinterlacing status - VFCTRL_GET_DEINTERLACE, // Get deinterlacing status -#endif VFCTRL_GET_METADATA, // Get frame metadata from lavfi filters (e.g., cropdetect) /* Hack to make the OSD state object available to vf_sub which * access OSD/subtitle state outside of normal OSD draw time. */ |