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. --- Copyright | 3 --- options/options.c | 5 ----- player/loadfile.c | 6 ------ 3 files changed, 14 deletions(-) diff --git a/Copyright b/Copyright index 71b10cf4c7..63470c717c 100644 --- a/Copyright +++ b/Copyright @@ -43,7 +43,6 @@ them quite central: - many builtin video filters (use libavfilter instead) - automatic rotation and stereoscopic video handling - Linux TV input -- the --frames option - the add/cycle and sub-add/audio-add/sub-remove/audio-remove commands - video format conversion (if not supported by the VO) - minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO @@ -111,10 +110,8 @@ The following files are still GPL only (--enable-lgpl disables them): The following files contain some optional GPL code (--enable-lgpl disables it): input/cmd_list.c potentially some commands - options/options.c --frames option options/parse_commandline.c dvd:// expansion player/audio.c libaf glue code - player/loadfile.c --frames option (minor but probably fatal) player/osd.c OSD level 3 player/command.c add/cycle command, possibly sub-add command 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), diff --git a/player/loadfile.c b/player/loadfile.c index 543fd02458..63089abe49 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1193,10 +1193,7 @@ static void play_current_file(struct MPContext *mpctx) load_per_file_options(mpctx->mconfig, mpctx->playing->params, mpctx->playing->num_params); -#if HAVE_GPL - // Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848. mpctx->max_frames = opts->play_frames; -#endif handle_force_window(mpctx, false); @@ -1323,15 +1320,12 @@ reopen_file: mp_notify(mpctx, MPV_EVENT_FILE_LOADED, NULL); update_screensaver_state(mpctx); -#if HAVE_GPL - // Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848. if (mpctx->max_frames == 0) { if (!mpctx->stop_play) mpctx->stop_play = PT_NEXT_ENTRY; mpctx->error_playing = 0; goto terminate_playback; } -#endif double startpos = rel_time_to_abs(mpctx, opts->play_start); if (startpos == MP_NOPTS_VALUE && opts->chapterrange[0] > 0) { -- cgit v1.2.3