Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Copyright/License on ffmpeg_burnins.py #679

Merged
merged 16 commits into from
Apr 2, 2020
Merged

Update Copyright/License on ffmpeg_burnins.py #679

merged 16 commits into from
Apr 2, 2020

Conversation

repsac
Copy link
Contributor

@repsac repsac commented Apr 2, 2020

@repsac
initial commit
1a19d06
@repsac
updating with renamed modules and added to the license
cba1a7d
@repsac
Merge pull request #1 from repsac/burnin
7a8b7b0 
Second attempt at burnin adapter
@repsac
Ading Pillow (PIP) to travis' pip install
cb1eb3e 
Moved bundling comment to LICENSE.txt
Improved box drawing for background
Added second unittest for burins without backgrounds
@repsac
Merge pull request #2 from repsac/burnin
1c8ab85 
Adding Pillow (PIP) to travis' pip install
@repsac
adjusting the ffmpeg_burnins lib to not parse a system font unless us…
13a3314 
…ing RIGHT alignments

this should get around the test case issues
@repsac
Merge pull request #3 from repsac/burnin
6aa40d0 
adjusting the ffmpeg_burnins lib to not parse a system font
@repsac
Merge remote-tracking branch 'upstream/master'
8038148 
updating
@repsac
Adding timecode support
74fcbff
@repsac
Merge branch 'master' of https://github.com/repsac/OpenTimelineIO
8ef96a5 
merging
@repsac
fixing E303 too many blank lines (3)
ae17871
@repsac
Fixud an issue with escaping back slashes on Windows
aa6830c
@repsac
Merge branch 'master' of https://github.com/PixarAnimationStudios/Ope…
a01781d 
…nTimelineIO

# Conflicts:
#	contrib/adapters/ffmpeg_burnins.py
#	contrib/adapters/tests/test_burnins.py
@repsac
removing os.sep*2 logic
2f6d419
@repsac
Merge branch 'master' of git://github.com/PixarAnimationStudios/OpenT…
0aa0ea2 
…imelineIO

# Conflicts:
#	contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py
@repsac
Changed copyright for AcademySoftwareFoundation#658
0bc319e
@codecov-io
Copy link

codecov-io commented Apr 2, 2020 •
edited
Loading

Codecov Report

Merging #679 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #679      +/-   ##
==========================================
- Coverage   81.69%   81.67%   -0.03%     
==========================================
  Files          72       72              
  Lines        2731     2728       -3     
==========================================
- Hits         2231     2228       -3     
  Misses        500      500
Flag Coverage Δ
#py27 ?
#py36 81.67% <ø> (ø)
#py37 81.67% <ø> (ø)
Impacted Files Coverage Δ
...ntimelineio/opentimelineio-bindings/otio_utils.cpp 87.05% <0.00%> (-0.16%) ⬇️
...elineio/opentimelineio-bindings/otio_anyVector.cpp 100.00% <0.00%> (ø)
...eio/opentimelineio-bindings/otio_anyDictionary.cpp 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9d010f2...0bc319e. Read the comment docs.

@jminor jminor merged commit d63e249 into AcademySoftwareFoundation:master Apr 2, 2020
@jminor
Copy link
Collaborator

jminor commented Apr 2, 2020

Thanks @repsac !

@jminor jminor mentioned this pull request Apr 2, 2020
Closed
andrewmoore-nz added a commit to andrewmoore-nz/OpenTimelineIO that referenced this pull request Apr 19, 2020
@andrewmoore-nz
Merge branch 'master' into MB_DEV
0ea78dd 
* master: (23 commits)
  Indicate Empty track in otioview and display track name (AcademySoftwareFoundation#677)
  FCP 7 XML - Fix failure on empty name tags (AcademySoftwareFoundation#674)
  xges: Effects and Markers Support (AcademySoftwareFoundation#609)
  Add List of Supported Formats to Conform.py Help Text (AcademySoftwareFoundation#676)
  Update Copyright/License on ffmpeg_burnins.py (AcademySoftwareFoundation#679)
  Fix the windows build (AcademySoftwareFoundation#669)
  Version bump to beta 13
  Set final version for beta 12.0 (AcademySoftwareFoundation#665)
  Rodeofx fix cmx 3600 multiple markers per clip issue 593 (AcademySoftwareFoundation#664)
  Tweaks to cmake so that pip and local builds both work (AcademySoftwareFoundation#663)
  Fixed issue where CMX3600 adapter would try to add the same clip to multiple tracks. Also moved some code out of a loop it didn't need to be in. (AcademySoftwareFoundation#644)
  RV adapter metadata updates (AcademySoftwareFoundation#640)
  Expose json indent to the otio_json adapter (AcademySoftwareFoundation#641)
  fix otioconvert for Kdenlive with python3 (AcademySoftwareFoundation#646)
  Add basic debugging instructions to quickstart. (AcademySoftwareFoundation#655)
  Add kdenlive adapter to adapters list. (AcademySoftwareFoundation#661)
  Timecode rate is ignored (AcademySoftwareFoundation#612)
  Detect if plugin doesn't have a docstring and return an error which says which plugin it is that doesn't have the docstring. (AcademySoftwareFoundation#635)
  Add hook function args to otioview and otioconvert (AcademySoftwareFoundation#651)
  Updating Copyright notices (AcademySoftwareFoundation#660)
  ...

# Conflicts:
#	contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py
#	src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py
jminor added a commit to jminor/OpenTimelineIO that referenced this pull request Feb 11, 2022
@jminor
Removed mention of ffmpeg_burnins license, which was previously relic…
6855ed1 
…ensed here: AcademySoftwareFoundation#679
jminor added a commit to jminor/OpenTimelineIO that referenced this pull request Feb 12, 2022
@jminor
Removed mention of ffmpeg_burnins license, which was previously relic…
a12f163 
…ensed here: AcademySoftwareFoundation#679
jminor added a commit to jminor/OpenTimelineIO that referenced this pull request May 2, 2022
@jminor
Removed mention of ffmpeg_burnins license, which was previously relic…
28fb117 
…ensed here: AcademySoftwareFoundation#679
jminor added a commit that referenced this pull request May 2, 2022
@jminor
Removed mention of ffmpeg_burnins license, which was previously relic…
bd8d098 
…ensed here: #679
jminor added a commit to jminor/OpenTimelineIO that referenced this pull request May 2, 2022
@jminor
Removed mention of ffmpeg_burnins license, which was previously relic…
290d36a 
…ensed here: AcademySoftwareFoundation#679
jminor added a commit that referenced this pull request May 3, 2022
@jminor
OpenTimelineIO License & CLA Change (#1285)
dc5298b 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: #679
markreidvfx pushed a commit to OpenTimelineIO/otio-aaf-adapter that referenced this pull request Jul 9, 2022
@jminor @markreidvfx
OpenTimelineIO License & CLA Change (#1285)
f61de2a 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
markreidvfx pushed a commit to OpenTimelineIO/otio-aaf-adapter that referenced this pull request Jul 9, 2022
@jminor
OpenTimelineIO License & CLA Change (#1285)
8592549 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
apetrynet pushed a commit to OpenTimelineIO/otio-fcp-adapter that referenced this pull request Dec 13, 2022
@jminor
OpenTimelineIO License & CLA Change (#1285)
2075361 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
apetrynet pushed a commit to OpenTimelineIO/otio-svg-adapter that referenced this pull request Dec 15, 2022
@jminor
OpenTimelineIO License & CLA Change (#1285)
10e6ae3 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to OpenTimelineIO/otio-maya-sequencer-adapter that referenced this pull request Jan 16, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
2bad192 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to rosborne132/otio-maya-sequencer-adapter that referenced this pull request Jan 17, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
d1fc16f 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to rosborne132/otio-maya-sequencer-adapter that referenced this pull request Jan 17, 2023
@jminor @rosborne132
OpenTimelineIO License & CLA Change (#1285)
5f1eb33 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679

Signed-off-by: rosborne132 <[email protected]>
rosborne132 pushed a commit to OpenTimelineIO/otio-fcpx-xml-adapter that referenced this pull request Jan 21, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
768dd80 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to OpenTimelineIO/otio-hls-playlist-adapter that referenced this pull request Jan 26, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
78f0954 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to OpenTimelineIO/otio-ale-adapter that referenced this pull request Jan 30, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
4966028 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to OpenTimelineIO/otio-burnins-adapter that referenced this pull request Feb 2, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
2a7869f 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
rosborne132 pushed a commit to OpenTimelineIO/otio-xges-adapter that referenced this pull request Feb 4, 2023
@jminor
OpenTimelineIO License & CLA Change (#1285)
2b886a4 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation/OpenTimelineIO#679
MichaelPlug pushed a commit to MichaelPlug/OpenTimelineIO that referenced this pull request Aug 5, 2023
@jminor @MichaelPlug
OpenTimelineIO License & CLA Change (AcademySoftwareFoundation#1285)
4fb0f3a 
* Updated both Corporate and Individual CLA
* Switched to standard Apache License, Version 2.0
* Added verify_license.py script to help ensure all source files have the right license header.
* Added SPDX license headers
* Update contributing.md and CONTRIBUTING.md to explain EasyCLA
* Removed mention of ffmpeg_burnins license, which was previously relicensed here: AcademySoftwareFoundation#679

Signed-off-by: Michele Spina <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jminor jminor jminor approved these changes

@ssteinbach ssteinbach ssteinbach approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@repsac @codecov-io @jminor @ssteinbach