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.

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

Update #5

Merged
merged 98 commits into from
Feb 27, 2017
Merged

Update #5

merged 98 commits into from
Feb 27, 2017

Conversation

tburrows13
Copy link
Owner

No description provided.

temerick and others added 30 commits August 24, 2015 16:00
Changed documentation for the color parameter to distinguish from bg_color
(using python 3)
The docstring for the on_color method has a parameter of bg_color but
the function uses color as the parameter.
Changed Code Block to use Python Syntax Highlighting
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.
```
Add `self.filename` as a `VideoFileClip` attribute
merge latest zulko/moviepy to earney/moviepy
Update maintainer section in README
ensures int arguments to np.reshape; closes #383
pull most recent from Zulko/moviepy
on_color function docstring has wrong parameter
merge most recent from zulko
fix issue #313, make concatenate_videoclips python 3 compatible.
bearney74 and others added 29 commits February 21, 2017 14:39
* fix issue #385 , no DirectoryClip class

* replace DirectoryClip with ImageSequenceClip
Handle bytes when listing fonts in VideoClip.py
Handle bytes when listing fonts in VideoClip.py (#306)
* move PR test from test_issues.py to test_PR.py
fix issue 417..  unicode has no attribute shape  (error in python 2)
added testing via travis-ci
* 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
@tburrows13 tburrows13 merged commit cd06bc1 into tburrows13:master Feb 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet