Skip to content

Commit a8bbb9b

Browse files
authored
Merge pull request #214 from hyandell/master
Relicensing to Apache 2.0
2 parents 04069da + 54cb1e8 commit a8bbb9b

File tree

4 files changed

+178
-117
lines changed

4 files changed

+178
-117
lines changed

LICENSE

Lines changed: 175 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,175 @@
1-
Amazon Software License 1.0
2-
3-
This Amazon Software License ("License") governs your use, reproduction, and
4-
distribution of the accompanying software as specified below.
5-
6-
1. Definitions
7-
8-
"Licensor" means any person or entity that distributes its Work.
9-
10-
"Software" means the original work of authorship made available under this
11-
License.
12-
13-
"Work" means the Software and any additions to or derivative works of the
14-
Software that are made available under this License.
15-
16-
The terms "reproduce," "reproduction," "derivative works," and
17-
"distribution" have the meaning as provided under U.S. copyright law;
18-
provided, however, that for the purposes of this License, derivative works
19-
shall not include works that remain separable from, or merely link (or bind
20-
by name) to the interfaces of, the Work.
21-
22-
Works, including the Software, are "made available" under this License by
23-
including in or with the Work either (a) a copyright notice referencing the
24-
applicability of this License to the Work, or (b) a copy of this License.
25-
26-
2. License Grants
27-
28-
2.1 Copyright Grant. Subject to the terms and conditions of this License,
29-
each Licensor grants to you a perpetual, worldwide, non-exclusive,
30-
royalty-free, copyright license to reproduce, prepare derivative works of,
31-
publicly display, publicly perform, sublicense and distribute its Work and
32-
any resulting derivative works in any form.
33-
34-
2.2 Patent Grant. Subject to the terms and conditions of this License, each
35-
Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free
36-
patent license to make, have made, use, sell, offer for sale, import, and
37-
otherwise transfer its Work, in whole or in part. The foregoing license
38-
applies only to the patent claims licensable by Licensor that would be
39-
infringed by Licensor's Work (or portion thereof) individually and
40-
excluding any combinations with any other materials or technology.
41-
42-
3. Limitations
43-
44-
3.1 Redistribution. You may reproduce or distribute the Work only if
45-
(a) you do so under this License, (b) you include a complete copy of this
46-
License with your distribution, and (c) you retain without modification
47-
any copyright, patent, trademark, or attribution notices that are present
48-
in the Work.
49-
50-
3.2 Derivative Works. You may specify that additional or different terms
51-
apply to the use, reproduction, and distribution of your derivative works
52-
of the Work ("Your Terms") only if (a) Your Terms provide that the use
53-
limitation in Section 3.3 applies to your derivative works, and (b) you
54-
identify the specific derivative works that are subject to Your Terms.
55-
Notwithstanding Your Terms, this License (including the redistribution
56-
requirements in Section 3.1) will continue to apply to the Work itself.
57-
58-
3.3 Use Limitation. The Work and any derivative works thereof only may be
59-
used or intended for use with the web services, computing platforms or
60-
applications provided by Amazon.com, Inc. or its affiliates, including
61-
Amazon Web Services, Inc.
62-
63-
3.4 Patent Claims. If you bring or threaten to bring a patent claim against
64-
any Licensor (including any claim, cross-claim or counterclaim in a
65-
lawsuit) to enforce any patents that you allege are infringed by any Work,
66-
then your rights under this License from such Licensor (including the
67-
grants in Sections 2.1 and 2.2) will terminate immediately.
68-
69-
3.5 Trademarks. This License does not grant any rights to use any
70-
Licensor's or its affiliates' names, logos, or trademarks, except as
71-
necessary to reproduce the notices described in this License.
72-
73-
3.6 Termination. If you violate any term of this License, then your rights
74-
under this License (including the grants in Sections 2.1 and 2.2) will
75-
terminate immediately.
76-
77-
4. Disclaimer of Warranty.
78-
79-
THE WORK IS PROVIDED "AS IS" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
80-
EITHER EXPRESS OR IMPLIED, INCLUDING WARRANTIES OR CONDITIONS OF
81-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR
82-
NON-INFRINGEMENT. YOU BEAR THE RISK OF UNDERTAKING ANY ACTIVITIES UNDER
83-
THIS LICENSE. SOME STATES' CONSUMER LAWS DO NOT ALLOW EXCLUSION OF AN
84-
IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO YOU.
85-
86-
5. Limitation of Liability.
87-
88-
EXCEPT AS PROHIBITED BY APPLICABLE LAW, IN NO EVENT AND UNDER NO LEGAL
89-
THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE
90-
SHALL ANY LICENSOR BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT,
91-
INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
92-
RELATED TO THIS LICENSE, THE USE OR INABILITY TO USE THE WORK (INCLUDING
93-
BUT NOT LIMITED TO LOSS OF GOODWILL, BUSINESS INTERRUPTION, LOST PROFITS
94-
OR DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY OTHER COMM ERCIAL DAMAGES
95-
OR LOSSES), EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF
96-
SUCH DAMAGES.
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Please follow the **installation instructions** applicable to your operating sys
4545

4646
### License
4747

48-
This library is licensed under the Amazon Software License.
48+
This library is licensed under the Apache License, 2.0.
4949

5050
----
5151
### Release notes

kinesis-video-gstreamer-plugin/plugin-src/gstkvssink.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
//
3-
// Licensed under the Amazon Software License (the "License").
4-
// You may not use this file except in compliance with the License.
5-
// A copy of the License is located at
6-
//
7-
// http://aws.amazon.com/asl/
8-
//
9-
// or in the "license" file accompanying this file. This file is distributed
10-
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11-
// express or implied. See the License for the specific language governing
12-
// permissions and limitations under the License.
3+
// SPDX-License-Identifier: Apache-2.0
134
//
145
// Portions Copyright
156
/*

kinesis-video-gstreamer-plugin/plugin-src/gstkvssink.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
//
3-
// Licensed under the Amazon Software License (the "License").
4-
// You may not use this file except in compliance with the License.
5-
// A copy of the License is located at
6-
//
7-
// http://aws.amazon.com/asl/
8-
//
9-
// or in the "license" file accompanying this file. This file is distributed
10-
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11-
// express or implied. See the License for the specific language governing
12-
// permissions and limitations under the License.
3+
// SPDX-License-Identifier: Apache-2.0
134
//
145
// Portions Copyright
156
/*

0 commit comments

Comments
 (0)