summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-11-06 20:53:27 +0100
committerwm4 <wm4@nowhere>2017-11-06 20:53:27 +0100
commita2a623ebb9309d05113bd400449b618aa21f783f (patch)
treeb92f74d74e816bd7588f60dad984e3829f6a6c47 /player
parent921073bf8645ed9e74e8e2463d2a6f6ab9c7bfe6 (diff)
downloadmpv-a2a623ebb9309d05113bd400449b618aa21f783f.tar.bz2
mpv-a2a623ebb9309d05113bd400449b618aa21f783f.tar.xz
player: change license of some code surrounding --frames to LGPL
The original author of the patch has agreed now.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c6
1 files changed, 0 insertions, 6 deletions
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) {