From 955cc50e1beb362f01475786696c8f5125077fd1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 3 Aug 2017 09:44:36 +0200
Subject: options: --priority can be LGPL

Original author has agreed now.

Also fix the notice in dec_video.c - all GPL-only code is gone
(unrelated to --priority/its author).
---
 options/options.c        | 2 +-
 player/command.c         | 2 +-
 video/decode/dec_video.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/options/options.c b/options/options.c
index 1dabb4c536..7d299a9aa7 100644
--- a/options/options.c
+++ b/options/options.c
@@ -273,7 +273,7 @@ const m_option_t mp_opts[] = {
     OPT_STRING("log-file", log_file, CONF_PRE_PARSE | M_OPT_FILE | UPDATE_TERM),
     OPT_FLAG("msg-module", msg_module, UPDATE_TERM),
     OPT_FLAG("msg-time", msg_time, UPDATE_TERM),
-#if HAVE_WIN32_DESKTOP && HAVE_GPL
+#if HAVE_WIN32_DESKTOP
     OPT_CHOICE("priority", w32_priority, UPDATE_PRIORITY,
                ({"no",          0},
                 {"realtime",    REALTIME_PRIORITY_CLASS},
diff --git a/player/command.c b/player/command.c
index e9a321627f..c282c5349f 100644
--- a/player/command.c
+++ b/player/command.c
@@ -5828,7 +5828,7 @@ void mp_notify(struct MPContext *mpctx, int event, void *arg)
 
 static void update_priority(struct MPContext *mpctx)
 {
-#if HAVE_WIN32_DESKTOP && HAVE_GPL
+#if HAVE_WIN32_DESKTOP
     struct MPOpts *opts = mpctx->opts;
     if (opts->w32_priority > 0)
         SetPriorityClass(GetCurrentProcess(), opts->w32_priority);
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index b1afdf3a18..8211d1f3b2 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -15,8 +15,6 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Almost LGPL.
- *
- * Parts under HAVE_GPL are licensed under GNU General Public License forever.
  */
 
 #include <stdio.h>
-- 
cgit v1.2.3