RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-21 02:41:13 +00:00
Code Issues Releases Wiki Activity

Revert "m_option: make geometry code GPL-only"

Browse Source 
This reverts commit e30fe38a21.

The original author as well as the author from d568eaa2 agreed to LGPL
now. The only one missing is 0842caf6 (Henk could not be reached, and
that will probably stay this way).

When I discussed this with someone else who knows a lot about copyright
(j-b), the conclusion was that the rewrite was actually enough to
remove all past copyright. Only the syntax and the option name remained
the same, but code, code structure, and architecture all changed
radically. So I'm content with dropping the GPL part.

(m_option.c is still formally GPL due to the special agreement with
michael, but once this is fullfilled, we will change the license to
LGPL without further checks.)
This commit is contained in:
wm4 2017-06-22 17:49:17 +02:00
parent 0788d7961f
commit f001b47cb8
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
options/m_option.c
View File

@ -1841,7 +1841,6 @@ const m_option_type_t m_option_type_color = {
.copy = copy_opt,
};
#if HAVE_GPL
// Parse a >=0 number starting at s. Set s to the string following the number.
// If the number ends with '%', eat that and set *out_per to true, but only
@ -2047,37 +2046,6 @@ const m_option_type_t m_option_type_size_box = {
.copy = copy_opt,
};
#else /* #if HAVE_GPL */
void m_geometry_apply(int *xpos, int *ypos, int *widw, int *widh,
int scrw, int scrh, struct m_geometry *gm)
{
// nothing
}
static int parse_dummy(struct mp_log *log, const m_option_t *opt,
struct bstr name, struct bstr param, void *dst)
{
mp_err(log, "Unavailable in LGPL mode.\n");
return M_OPT_INVALID;
}
const m_option_type_t m_option_type_geometry = {
.name = "Window geometry",
.size = sizeof(struct m_geometry),
.parse = parse_dummy,
.copy = copy_opt,
};
const m_option_type_t m_option_type_size_box = {
.name = "Window size",
.size = sizeof(struct m_geometry),
.parse = parse_dummy,
.copy = copy_opt,
};
#endif
#include "video/img_format.h"