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

Commits on Oct 4, 2017

  1. initial commit

    @repsac
    repsac committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    1a19d06 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2017

  1. updating with renamed modules and added to the license

    @repsac
    repsac committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    cba1a7d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from repsac/burnin 

    Second attempt at burnin adapter
    @repsac
    repsac authored Oct 5, 2017
    Configuration menu
    Copy the full SHA
    7a8b7b0 View commit details
    Browse the repository at this point in the history

  3. Ading Pillow (PIP) to travis' pip install 

    Moved bundling comment to LICENSE.txt
Improved box drawing for background
Added second unittest for burins without backgrounds
    @repsac
    repsac committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    cb1eb3e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from repsac/burnin 

    Adding Pillow (PIP) to travis' pip install
    @repsac
    repsac authored Oct 5, 2017
    Configuration menu
    Copy the full SHA
    1c8ab85 View commit details
    Browse the repository at this point in the history

  5. adjusting the ffmpeg_burnins lib to not parse a system font unless us… 

    …ing RIGHT alignments

this should get around the test case issues
    @repsac
    repsac committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    13a3314 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3 from repsac/burnin 

    adjusting the ffmpeg_burnins lib to not parse a system font
    @repsac
    repsac authored Oct 5, 2017
    Configuration menu
    Copy the full SHA
    6aa40d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2017

  1. Merge remote-tracking branch 'upstream/master' 

    updating
    @repsac
    repsac committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    8038148 View commit details
    Browse the repository at this point in the history

  2. Adding timecode support

    @repsac
    repsac committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    74fcbff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/repsac/OpenTimelineIO 

    merging
    @repsac
    repsac committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    8ef96a5 View commit details
    Browse the repository at this point in the history

  4. fixing E303 too many blank lines (3)

    @repsac
    repsac committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    ae17871 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2017

  1. Fixud an issue with escaping back slashes on Windows

    @repsac
    repsac committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    aa6830c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/PixarAnimationStudios/Ope… 

    …nTimelineIO

# Conflicts:
#	contrib/adapters/ffmpeg_burnins.py
#	contrib/adapters/tests/test_burnins.py
    @repsac
    repsac committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    a01781d View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. removing os.sep*2 logic

    @repsac
    repsac committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    2f6d419 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Merge branch 'master' of git://github.com/PixarAnimationStudios/OpenT… 

    …imelineIO

# Conflicts:
#	contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py
    @repsac
    repsac committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    0aa0ea2 View commit details
    Browse the repository at this point in the history

  2. Changed copyright for AcademySoftwareFoundation#658

    @repsac
    repsac committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    0bc319e View commit details
    Browse the repository at this point in the history