summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-22 17:49:17 +0200
committerwm4 <wm4@nowhere>2017-06-22 17:49:17 +0200
commitf001b47cb844076fcb584eceb67fbb6fc3a8f580 (patch)
tree269fc721852eca4bc3dec4b10aef14d1756b21be
parent0788d7961fd3816b1965a6ab90cd8d9994c774fe (diff)
downloadmpv-f001b47cb844076fcb584eceb67fbb6fc3a8f580.tar.bz2
mpv-f001b47cb844076fcb584eceb67fbb6fc3a8f580.tar.xz
Revert "m_option: make geometry code GPL-only"
This reverts commit e30fe38a212d52bca4693941a7cfa9e44b675a66. 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.)
-rw-r--r--options/m_option.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/options/m_option.c b/options/m_option.c
index db0d327672..bec2518b45 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -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"