diff options
| -rw-r--r-- | libmpv/client.h | 14 | ||||
| -rw-r--r-- | libmpv/opengl_cb.h | 14 | ||||
| -rw-r--r-- | libmpv/qthelper.hpp | 4 | ||||
| -rw-r--r-- | libmpv/stream_cb.h | 14 | ||||
| -rw-r--r-- | osdep/semaphore_osx.c | 4 | ||||
| -rw-r--r-- | osdep/win32/include/pthread.h | 15 | ||||
| -rw-r--r-- | osdep/win32/include/semaphore.h | 15 | ||||
| -rw-r--r-- | osdep/win32/pthread.c | 5 | ||||
| -rw-r--r-- | player/client.c | 4 | ||||
| -rw-r--r-- | ta/ta.c | 4 | ||||
| -rw-r--r-- | ta/ta.h | 4 | ||||
| -rw-r--r-- | ta/ta_talloc.c | 4 | ||||
| -rw-r--r-- | ta/ta_talloc.h | 4 | ||||
| -rw-r--r-- | ta/ta_utils.c | 4 |
14 files changed, 70 insertions, 39 deletions
diff --git a/libmpv/client.h b/libmpv/client.h index c6d67094d3..ff73a03eea 100644 --- a/libmpv/client.h +++ b/libmpv/client.h @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -12,13 +14,9 @@ */ /* - * Note: the client API is licensed under ISC (see above) to ease - * interoperability with other licenses. But keep in mind that the - * mpv core is still mostly GPLv2+. It's up to lawyers to decide - * whether applications using this API are affected by the GPL. - * One argument against this is that proprietary applications - * using mplayer in slave mode is apparently tolerated, and this - * API is basically equivalent to slave mode. + * Note: the client API is licensed under ISC (see above) to enable + * other wrappers outside of mpv. But keep in mind that the + * mpv core is still mostly GPLv2+. */ #ifndef MPV_CLIENT_API_H_ diff --git a/libmpv/opengl_cb.h b/libmpv/opengl_cb.h index fff76526a4..c77665d895 100644 --- a/libmpv/opengl_cb.h +++ b/libmpv/opengl_cb.h @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -11,16 +13,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* - * Note: the client API is licensed under ISC (see above) to ease - * interoperability with other licenses. But keep in mind that the - * mpv core is still mostly GPLv2+. It's up to lawyers to decide - * whether applications using this API are affected by the GPL. - * One argument against this is that proprietary applications - * using mplayer in slave mode is apparently tolerated, and this - * API is basically equivalent to slave mode. - */ - #ifndef MPV_CLIENT_API_OPENGL_CB_H_ #define MPV_CLIENT_API_OPENGL_CB_H_ diff --git a/libmpv/qthelper.hpp b/libmpv/qthelper.hpp index 8615d0f84b..f91aa15ea4 100644 --- a/libmpv/qthelper.hpp +++ b/libmpv/qthelper.hpp @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/libmpv/stream_cb.h b/libmpv/stream_cb.h index 1f1bf2333c..01de4700b2 100644 --- a/libmpv/stream_cb.h +++ b/libmpv/stream_cb.h @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -11,16 +13,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* - * Note: the client API is licensed under ISC (see above) to ease - * interoperability with other licenses. But keep in mind that the - * mpv core is still mostly GPLv2+. It's up to lawyers to decide - * whether applications using this API are affected by the GPL. - * One argument against this is that proprietary applications - * using mplayer in slave mode is apparently tolerated, and this - * API is basically equivalent to slave mode. - */ - #ifndef MPV_CLIENT_API_STREAM_CB_H_ #define MPV_CLIENT_API_STREAM_CB_H_ diff --git a/osdep/semaphore_osx.c b/osdep/semaphore_osx.c index 1bff233007..1e2015bddd 100644 --- a/osdep/semaphore_osx.c +++ b/osdep/semaphore_osx.c @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/osdep/win32/include/pthread.h b/osdep/win32/include/pthread.h index e1324a0bb0..870e9d7d5c 100644 --- a/osdep/win32/include/pthread.h +++ b/osdep/win32/include/pthread.h @@ -1,3 +1,18 @@ +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #ifndef MP_WRAP_PTHREAD_H_ #define MP_WRAP_PTHREAD_H_ diff --git a/osdep/win32/include/semaphore.h b/osdep/win32/include/semaphore.h index 49670fc7a5..bc0ed2e374 100644 --- a/osdep/win32/include/semaphore.h +++ b/osdep/win32/include/semaphore.h @@ -1,3 +1,18 @@ +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #ifndef MP_WRAP_SEMAPHORE_H_ #define MP_WRAP_SEMAPHORE_H_ diff --git a/osdep/win32/pthread.c b/osdep/win32/pthread.c index b215e46ba2..4f42cc3cd4 100644 --- a/osdep/win32/pthread.c +++ b/osdep/win32/pthread.c @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -10,6 +12,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + #include <pthread.h> #include <semaphore.h> diff --git a/player/client.c b/player/client.c index 85ee3862c0..e01f121a0c 100644 --- a/player/client.c +++ b/player/client.c @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/ta/ta_talloc.c b/ta/ta_talloc.c index 9c52bbab08..27dca221d6 100644 --- a/ta/ta_talloc.c +++ b/ta/ta_talloc.c @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/ta/ta_talloc.h b/ta/ta_talloc.h index a145ba1e7d..693fd091e0 100644 --- a/ta/ta_talloc.h +++ b/ta/ta_talloc.h @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/ta/ta_utils.c b/ta/ta_utils.c index 6a7455c1b9..cc122b58a2 100644 --- a/ta/ta_utils.c +++ b/ta/ta_utils.c @@ -1,4 +1,6 @@ -/* Permission to use, copy, modify, and/or distribute this software for any +/* Copyright (C) 2017 the mpv developers + * + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * |