Skip to content

Commit d63e249

Browse files
authored
Update Copyright/License on ffmpeg_burnins.py (#679)
* Changed copyright for #658
1 parent 9d010f2 commit d63e249

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
# MIT License
21
#
3-
# Copyright (c) 2017 Ed Caspersen
2+
# Copyright Contributors to the OpenTimelineIO project
43
#
5-
# Permission is hereby granted, free of charge, to any person obtaining a copy
6-
# of this software and associated documentation files (the "Software"), to deal
7-
# in the Software without restriction, including without limitation the rights
8-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
# copies of the Software, and to permit persons to whom the Software is
10-
# furnished to do so, subject to the following conditions:
4+
# Licensed under the Apache License, Version 2.0 (the "Apache License")
5+
# with the following modification; you may not use this file except in
6+
# compliance with the Apache License and the following modification to it:
7+
# Section 6. Trademarks. is deleted and replaced with:
118
#
12-
# The above copyright notice and this permission notice shall be included in
13-
# allcopies or substantial portions of the Software.
9+
# 6. Trademarks. This License does not grant permission to use the trade
10+
# names, trademarks, service marks, or product names of the Licensor
11+
# and its affiliates, except as required to comply with Section 4(c) of
12+
# the License and to reproduce the content of the NOTICE file.
13+
#
14+
# You may obtain a copy of the Apache License at
15+
#
16+
# http://www.apache.org/licenses/LICENSE-2.0
17+
#
18+
# Unless required by applicable law or agreed to in writing, software
19+
# distributed under the Apache License with the above modification is
20+
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21+
# KIND, either express or implied. See the Apache License for the specific
22+
# language governing permissions and limitations under the Apache License.
1423
#
15-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
# SOFTWARE.
2224
"""
2325
This module provides an interface to allow users to easily
2426
build out an FFMPEG command with all the correct filters
@@ -55,7 +57,7 @@ def _system_font():
5557
fonts = ('Menlo.ttc',)
5658
else:
5759
# assuming linux
58-
font_path = 'usr/share/fonts/msttcorefonts'
60+
font_path = '/usr/share/fonts/msttcorefonts'
5961
fonts = ('arial.ttf', 'times.ttf', 'couri.ttf')
6062

6163
system_font = None

0 commit comments

Comments
 (0)