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 #5

Merged
merged 98 commits into from
Feb 27, 2017
Merged

Update #5

merged 98 commits into from
Feb 27, 2017

Commits on Aug 24, 2015

  1. Fixed copy-paste typo 

    Changed documentation for the color parameter to distinguish from bg_color
    @temerick
    temerick committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    4e60a71 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2015

  1. Fixed missing list 

    (using python 3)
    LunarLanding committed Sep 20, 2015
    Configuration menu
    Copy the full SHA
    f0372ad View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. fixed module hierarchy for Trajectory

    @bwagner
    bwagner committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    efaba09 View commit details
    Browse the repository at this point in the history

  2. fixed addy

    @bwagner
    bwagner committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    2153c20 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2015

  1. small recipe

    Andres Vargas committed Dec 23, 2015
    Configuration menu
    Copy the full SHA
    3ae11f5 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2015

  1. on_color function docstring has wrong parameter 

    The docstring for the on_color method has a parameter of bg_color but
the function uses color as the parameter.
    @cblument
    cblument committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    8d0cc38 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. Update README.rst 

    Changed Code Block to use Python Syntax Highlighting
    @tcyrus
    tcyrus committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    f0dc512 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2016

  1. fix deprecation message 

    currently, the docstring is nonsense. 

```
The function ``concatenate_videoclips`` is deprecated and is kept temporarily for backwards compatibility.
Please use the new name, ``concatenate_videoclips``, instead.
```
    @mgaitan
    mgaitan authored Jun 16, 2016
    Configuration menu
    Copy the full SHA
    8986d2f View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. ImageSequenceClip: Check for fps and durations rather than fps and du… 

    …ration
    @jeromegrosse
    jeromegrosse committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    85c631d View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2016

  1. Add a test case.

    Andrew Wagner committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    33e2975 View commit details
    Browse the repository at this point in the history

  2. Add another test

    Andrew Wagner committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    870a5f4 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2017

  1. ensures int arguments to np.reshape; closes #383

    @tyarkoni
    tyarkoni committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    814b776 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. fix issue #401

    Billy Earney committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    04b6bc6 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Merge pull request #405 from Gloin1313/master 

    Add `self.filename` as a `VideoFileClip` attribute
    @Zulko
    Zulko authored Feb 14, 2017
    Configuration menu
    Copy the full SHA
    6453c7f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from Zulko/master 

    merge latest zulko/moviepy to earney/moviepy
    @bearney74
    bearney74 authored Feb 14, 2017
    Configuration menu
    Copy the full SHA
    05e88b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2017

  1. fix issue #335

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    015f9a3 View commit details
    Browse the repository at this point in the history

  2. Update maintainer section in README

    @mbeacom
    mbeacom committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    afa1eb3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #409 from mbeacom/fix-readme 

    Update maintainer section in README
    Mark Beacom authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    eb32bc1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #403 from earney/master 

    fix issue #401
    Mark Beacom authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    212db1f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #384 from tyarkoni/master 

    ensures int arguments to np.reshape; closes #383
    Mark Beacom authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    a49be81 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3 from Zulko/master 

    pull most recent from Zulko/moviepy
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    ef83248 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #244 from cblument/doc_fix 

    on_color function docstring has wrong parameter
    Mark Beacom authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    ceb4076 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #4 from Zulko/master 

    merge most recent from zulko
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    13ac192 View commit details
    Browse the repository at this point in the history

  9. make concatenate_videoclips Python 3 compatible.. fix issue #313

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    a87b99b View commit details
    Browse the repository at this point in the history

  10. Merge pull request #410 from earney/master 

    fix issue #313, make concatenate_videoclips python 3 compatible.
    Mark Beacom authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    3137695 View commit details
    Browse the repository at this point in the history

  11. Increment release version

    @mbeacom
    mbeacom committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    bed4266 View commit details
    Browse the repository at this point in the history

  12. CompositeVideoClip doesn't accept an argument of transparent

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    20a70f0 View commit details
    Browse the repository at this point in the history

  13. move PY3 variable to compat.py

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    a5a575a View commit details
    Browse the repository at this point in the history

  14. Merge pull request #5 from Zulko/master 

    merge
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    8a7f841 View commit details
    Browse the repository at this point in the history

  15. fix movie => moviepy typo

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    8c1aaa5 View commit details
    Browse the repository at this point in the history

  16. fix issue #341

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    cec4511 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of github.com:earney/moviepy

    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    a38e4cd View commit details
    Browse the repository at this point in the history

  18. Merge pull request #411 from earney/master 

    move PY3 to new compat.py file
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    2f824b0 View commit details
    Browse the repository at this point in the history

  19. Fixed typo #375 

    #375 fixed
    Gloin1313 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    e3480c6 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #6 from Zulko/master 

    pull from zulko/moviepy
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    16d7c81 View commit details
    Browse the repository at this point in the history

  21. fix issue #357, which makes real problem more obvious (media file doe… 

    …s not exist
    Billy Earney committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    f4a4606 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #243 from zodman/master 

    small recipe (mirroring a video)
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    75bc1af View commit details
    Browse the repository at this point in the history

  23. Revert "small recipe (mirroring a video)"

    @Zulko
    Zulko authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    f7ad6be View commit details
    Browse the repository at this point in the history

  24. Merge pull request #414 from Zulko/revert-243-master 

    Revert "small recipe (mirroring a video)"
    @Zulko
    Zulko authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    54bdeeb View commit details
    Browse the repository at this point in the history

  25. Merge pull request #7 from Zulko/master 

    sync with zulko/moviepy master
    @bearney74
    bearney74 authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    ca009a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. Merge pull request #302 from mgaitan/patch-2 

    Fixes concatenate deprecation message
    Gloin1313 authored Feb 16, 2017
    Configuration menu
    Copy the full SHA
    118f952 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #254 from tcyrus/patch-1 

    Update README.rst to add python syntax highlighting
    Gloin1313 authored Feb 16, 2017
    Configuration menu
    Copy the full SHA
    fb023fb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from Zulko/master 

    pull from zulko
    @bearney74
    bearney74 authored Feb 16, 2017
    Configuration menu
    Copy the full SHA
    1381b38 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2017

  1. Merge pull request #331 from jeromegrosse/bug-imagesequenceclip-duration 

    ImageSequenceClip: Check for fps and durations rather than fps and du…
    @bearney74
    bearney74 authored Feb 17, 2017
    Configuration menu
    Copy the full SHA
    64871cf View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2017

  1. Merge branch 'master' of https://github.com/Zulko/moviepy

    @tburrows13
    tburrows13 committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    c7e46a0 View commit details
    Browse the repository at this point in the history

  2. Fixed indentation

    Gloin1313 authored Feb 18, 2017
    Configuration menu
    Copy the full SHA
    58f9022 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2017

  1. .gitignore ignore Mac-specific files, Jetbrains settings dir

    @kerstin
    kerstin committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    2b9b14b View commit details
    Browse the repository at this point in the history

  2. README.rst make mention of Gitter, add PyPI and Gitter badge

    @kerstin
    kerstin committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    0360aee View commit details
    Browse the repository at this point in the history

  3. README.rst wording, formatting

    @kerstin
    kerstin committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    24c538a View commit details
    Browse the repository at this point in the history

  4. README.rst structure link targets, add co-maintainers (with @username)

    @kerstin
    kerstin committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    8ab44ea View commit details
    Browse the repository at this point in the history

  5. README.rst move maintainers, contributing sections; change docs x-ref… 

    …erence name
    @kerstin
    kerstin committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    11cc67d View commit details
    Browse the repository at this point in the history

  6. README.rst fix grammar

    @kerstin
    kerstin committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    fdd9413 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. Merge pull request #413 from earney/master 

    fixes #357.  confusing error about coreader, when media file does not exist
    @bearney74
    bearney74 authored Feb 20, 2017
    Configuration menu
    Copy the full SHA
    3d91ddd View commit details
    Browse the repository at this point in the history

  2. fix issue 145. raise Exception when concatenate method != chain or co… 

    …mpose
    @bearney74
    bearney74 committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    b4cf52f View commit details
    Browse the repository at this point in the history

  3. make PEP8 compatible

    @bearney74
    bearney74 committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    1bb1e3c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #428 from earney/issue_145 

    fix issue 145.  raise Exception when concatenate method != chain or c…
    @Zulko
    Zulko authored Feb 20, 2017
    Configuration menu
    Copy the full SHA
    35b4e5e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #425 from kerstin/readme_improvements 

    Readme improvements
    @kerstin
    kerstin authored Feb 20, 2017
    Configuration menu
    Copy the full SHA
    edbb772 View commit details
    Browse the repository at this point in the history

  6. fix PR #413 . (issue #357)

    @bearney74
    bearney74 committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    639e449 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #429 from earney/issue_145 

    fix PR #413 . (issue #357)
    @bearney74
    bearney74 authored Feb 20, 2017
    Configuration menu
    Copy the full SHA
    5ef16e9 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1 from Zulko/master 

    pull from zulko fork
    @bearney74
    bearney74 authored Feb 20, 2017
    Configuration menu
    Copy the full SHA
    f8092d0 View commit details
    Browse the repository at this point in the history

  9. create test for issue #145

    @bearney74
    bearney74 committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ed4adbe View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. add tests/media to .gitignore

    @bearney74
    bearney74 committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    19d4f03 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #431 from earney/pytest 

    test for issue #145
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    d3582b1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from Zulko/master 

    merge
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    360a407 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #339 from drewm1980/master 

    Add a test case.
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    66c061f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3 from Zulko/master 

    merge
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    cbbb276 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #197 from temerick/patch-1 

    Fixed copy-paste typo
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    2e036d3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #211 from LunarLanding/patch-1 

    Fixed missing list
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    e4d9032 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #215 from bwagner/master 

    fixed module hierarchy for Trajectory
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    ce38d41 View commit details
    Browse the repository at this point in the history

  9. fix Issue #385 , no DirectoryClip class (#434) 

    * fix issue #385 , no DirectoryClip class

* replace DirectoryClip with ImageSequenceClip
    @bearney74
    bearney74 authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    fca1727 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2017

  1. fix issue 417, unicode has no attribute 'shape' error.

    @bearney74
    bearney74 committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    3870506 View commit details
    Browse the repository at this point in the history

  2. add test for issue 417

    @bearney74
    bearney74 committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    3ec5106 View commit details
    Browse the repository at this point in the history

  3. add test for issue 417

    @bearney74
    bearney74 committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    3d877cb View commit details
    Browse the repository at this point in the history

  4. Fixed resize documentation issue #319 (#346)

    @jmisacube @bearney74
    jmisacube authored and bearney74 committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    32b7007 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from Zulko/master 

    merge
    @bearney74
    bearney74 authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    fe3474e View commit details
    Browse the repository at this point in the history

  6. Handle bytes when listing fonts in VideoClip.py (#306) 

    Handle bytes when listing fonts in VideoClip.py
    @Zowie @bearney74
    Zowie authored and bearney74 committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    df31c03 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from Zulko/master 

    Handle bytes when listing fonts in VideoClip.py (#306)
    @bearney74
    bearney74 authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    c019484 View commit details
    Browse the repository at this point in the history

  8. add test for PR306

    @bearney74
    bearney74 committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    f07e6a3 View commit details
    Browse the repository at this point in the history

  9. add test for PR306 (#440)

    @bearney74
    bearney74 authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    ba1dd25 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #6 from Zulko/master 

    add test for PR306 (#440)
    @bearney74
    bearney74 authored Feb 22, 2017
    Configuration menu
    Copy the full SHA
    319a52d View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. create test file for pull requests (#433)

    @bearney74
    bearney74 authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    372177a View commit details
    Browse the repository at this point in the history

  2. Test issue 407 (video has a valid fps after concatenate function) (#443)

    @bearney74
    bearney74 authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    09d3572 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from Zulko/master 

    merge
    @bearney74
    bearney74 authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    674b1d7 View commit details
    Browse the repository at this point in the history

  4. Move PR test to test_PR.py file (#444) 

    * move PR test from test_issues.py to test_PR.py
    @bearney74
    bearney74 authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    fd36a54 View commit details
    Browse the repository at this point in the history

  5. fix merge issue, add code to add python image for tests

    @bearney74
    bearney74 committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    4446225 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'earney-issue417'

    @bearney74
    bearney74 committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    8c41594 View commit details
    Browse the repository at this point in the history

  7. add code to download python_logo.png

    @bearney74
    bearney74 committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    9e6b9c8 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into issue417

    @bearney74
    bearney74 authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    ff44f23 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into master

    @bearney74
    bearney74 authored Feb 23, 2017
    Configuration menu
    Copy the full SHA
    b3dba11 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Merge pull request #438 from earney/issue417 

    fix issue 417..  unicode has no attribute shape  (error in python 2)
    @bearney74
    bearney74 authored Feb 24, 2017
    Configuration menu
    Copy the full SHA
    83ed8a5 View commit details
    Browse the repository at this point in the history

  2. remove duplicate test_issue_417 function

    @bearney74
    bearney74 authored Feb 24, 2017
    Configuration menu
    Copy the full SHA
    b1016cb View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2017

  1. add testing with travis-ci (#447) 

    added testing via travis-ci
    @bearney74
    bearney74 authored Feb 26, 2017
    Configuration menu
    Copy the full SHA
    ff82fe8 View commit details
    Browse the repository at this point in the history

  2. put DEVNULL into compat.py (#432)

    @bearney74
    bearney74 authored Feb 26, 2017
    Configuration menu
    Copy the full SHA
    ec57a19 View commit details
    Browse the repository at this point in the history

  3. add travis-ci badge to readme file

    @bearney74
    bearney74 authored Feb 26, 2017
    Configuration menu
    Copy the full SHA
    e8d124a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. pick highest fps when concatenating (#416) 

    * readers.py cast chunksize from float to int

* choose highest fps of clips when concatenating

* pick highest fps when concatenating

* pick highest fps when concatenating

* fps either max or none

* remove resolve markers

removed resolve markers such as HEAD, etc so that the file will compile correctly.
Remove some double blank lines, etc

* update concatenate.py; add c.fps is not None
    @BrianLee608 @bearney74
    BrianLee608 authored and bearney74 committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    c0f6925 View commit details
    Browse the repository at this point in the history

  2. add test for issue 416

    @bearney74
    bearney74 authored Feb 27, 2017
    Configuration menu
    Copy the full SHA
    5eb43c9 View commit details
    Browse the repository at this point in the history

  3. fix test_issue_416

    @bearney74
    bearney74 authored Feb 27, 2017
    Configuration menu
    Copy the full SHA
    04bb711 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into master

    Gloin1313 authored Feb 27, 2017
    Configuration menu
    Copy the full SHA
    b8bc801 View commit details
    Browse the repository at this point in the history