From a2a623ebb9309d05113bd400449b618aa21f783f Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 6 Nov 2017 20:53:27 +0100 Subject: player: change license of some code surrounding --frames to LGPL The original author of the patch has agreed now. --- options/options.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index bac9b3bcaf..22e448d22f 100644 --- a/options/options.c +++ b/options/options.c @@ -13,8 +13,6 @@ * * You should have received a copy of the GNU Lesser General Public * License along with mpv. If not, see . - * - * Parts under HAVE_GPL are licensed under GNU General Public License. */ #ifndef MPLAYER_CFG_MPLAYER_H @@ -326,10 +324,7 @@ const m_option_t mp_opts[] = { // ------------------------- demuxer options -------------------- -#if HAVE_GPL - // Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848. OPT_CHOICE_OR_INT("frames", play_frames, 0, 0, INT_MAX, ({"all", -1})), -#endif OPT_REL_TIME("start", play_start, 0), OPT_REL_TIME("end", play_end, 0), -- cgit v1.2.3