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

Added ffmpeg download when importing moviepy.editor #731

Merged
merged 4 commits into from
Apr 16, 2018
Merged

Added ffmpeg download when importing moviepy.editor #731

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
718879b
Added ffmpeg download
tburrows13 Feb 28, 2018
17b90fa
Update editor.py
tburrows13 Mar 18, 2018
e232f4b
Update editor.py
tburrows13 Mar 18, 2018
27f6485
Fix typo
tburrows13 Mar 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion moviepy/editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@
# Note that these imports could have been performed in the __init__.py
# file, but this would make the loading of moviepy slower.

# Clips
import os

# Downloads ffmpeg if it isn't already installed
import imageio
# Checks to see if the user has set a place for their own version of ffmpeg
if os.getenv('FFMPEG_BINARY', 'ffmpeg-imageio') == 'ffmpeg-imageio':
imageio.plugins.ffmpeg.download()

# Clips
from .video.io.VideoFileClip import VideoFileClip
from .video.io.ImageSequenceClip import ImageSequenceClip
from .video.io.downloader import download_webfile
Expand Down