Skip to content

Commit

Permalink
Merge pull request #548 from Gloin1313/update_docs
Browse files Browse the repository at this point in the history
Update docs
  • Loading branch information
Gloin1313 committed Apr 19, 2017
2 parents a25768a + 906cdc4 commit c6e3a22
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions moviepy/video/VideoClip.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def write_videofile(self, filename, fps=None, codec=None,
``png`` (use file extension ``.avi``) will produce a video
of perfect quality, of smaller size than with ``rawvideo``
of perfect quality, of smaller size than with ``rawvideo``.
``'libvorbis'`` (use file extension ``.ogv``) is a nice video
Expand Down Expand Up @@ -251,19 +251,19 @@ def write_videofile(self, filename, fps=None, codec=None,
threads
Number of threads to use for ffmpeg. Can speed up the writing of
the video on multicore computers
the video on multicore computers.
ffmpeg_params
Any additional ffmpeg parameters you would like to pass, as a list
of terms, like ['-option1', 'value1', '-option2', 'value2']
of terms, like ['-option1', 'value1', '-option2', 'value2'].
write_logfile
If true, will write log files for the audio and the video.
These will be files ending with '.log' with the name of the
output file in them.
verbose
Boolean indicating whether to print infomation
Boolean indicating whether to print infomation.
progress_bar
Boolean indicating whether to show the progress bar.
Expand Down Expand Up @@ -377,10 +377,10 @@ def write_images_sequence(self, nameformat, fps=None, verbose=True,
be used if it has one.
withmask
will save the clip's mask (if any) as an alpha canal (PNGs only)
will save the clip's mask (if any) as an alpha canal (PNGs only).
verbose
Boolean indicating whether to print infomation
Boolean indicating whether to print infomation.
progress_bar
Boolean indicating whether to show the progress bar.
Expand Down
2 changes: 1 addition & 1 deletion moviepy/video/tools/subtitles.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SubtitlesClip(VideoClip):
>>> sub = SubtitlesClip("subtitles.srt", generator)
>>> myvideo = VideoFileClip("myvideo.avi")
>>> final = CompositeVideoClip([clip, subtitles])
>>> final.to_videofile("final.mp4", fps=myvideo.fps)
>>> final.write_videofile("final.mp4", fps=myvideo.fps)
"""

Expand Down

0 comments on commit c6e3a22

Please sign in to comment.