summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-23 15:17:01 +0200
committerwm4 <wm4@nowhere>2017-06-23 16:54:09 +0200
commitd81576c9a6da02e3019fb55f7ec039eb673b62af (patch)
treed55bcd8685e2d65451b8fe8ffc361352194a41db /player
parent96b906a51d5cb42b5e8f90d83259ca0b3bfb2485 (diff)
downloadmpv-d81576c9a6da02e3019fb55f7ec039eb673b62af.tar.bz2
mpv-d81576c9a6da02e3019fb55f7ec039eb673b62af.tar.xz
player: disable --frames in WIP LGPL mode
Commit d8fd7131 changes this. "tibcu" did not reply. While I'm not sure whether copyrightable code remains, I'd tend towards saying yes (the basic idea is still intact after years of refactoring), so make it GPL-only for now.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index e0a796d9fc..95b3eb0350 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1117,7 +1117,10 @@ 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);
@@ -1247,12 +1250,15 @@ 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) {