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. --- player/loadfile.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'player/loadfile.c') 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