diff options
| author | wm4 <wm4@nowhere> | 2017-06-23 15:09:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-23 15:09:21 +0200 |
| commit | dcd4528d219962d692b0108c42a2fbd028db0244 (patch) | |
| tree | 031271d7154d6ee40b285fd584f4b5e77c50cc2e /player/command.c | |
| parent | 54e2b1e9f3e64c1724b2ed52c177508e9b23a404 (diff) | |
| download | mpv-dcd4528d219962d692b0108c42a2fbd028db0244.tar.bz2 mpv-dcd4528d219962d692b0108c42a2fbd028db0244.tar.xz | |
player: disable deinterlace property for WIP LGPL mode
cehoyos has not agreed to the LGPL relicensing. He added the deinterlace
property in commit 7b25afd7. Make it GPL-only for now. The still working
parts of the --deinterlace option are not affected by his copyright.
Diffstat (limited to 'player/command.c')
| -rw-r--r-- | player/command.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/player/command.c b/player/command.c index c84007eb0d..07631ffb08 100644 --- a/player/command.c +++ b/player/command.c @@ -2486,6 +2486,8 @@ static int mp_property_hwdec_interop(void *ctx, struct m_property *prop, return m_property_strdup_ro(action, arg, name); } +#if HAVE_GPL +// Possibly GPL due to 7b25afd7423e9056782993cbd1b32ead64ac1462. static int mp_property_deinterlace(void *ctx, struct m_property *prop, int action, void *arg) { @@ -2505,6 +2507,7 @@ static int mp_property_deinterlace(void *ctx, struct m_property *prop, } return mp_property_generic_option(mpctx, prop, action, arg); } +#endif /// Helper to set vo flags. /** \ingroup PropertyImplHelper @@ -3959,7 +3962,9 @@ static const struct m_property mp_properties_base[] = { // Video {"fullscreen", mp_property_fullscreen}, +#if HAVE_GPL {"deinterlace", mp_property_deinterlace}, +#endif {"taskbar-progress", mp_property_taskbar_progress}, {"ontop", mp_property_ontop}, {"border", mp_property_border}, |