8000 Merge remote-tracking branch 'origin/feature-1' into HEAD · Powercoder64/ffmpeg-python@0647c68 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 0647c68

Browse files
kkroeningkkroening
committed
Merge remote-tracking branch 'origin/feature-1' into HEAD
Conflicts: ffmpeg/__init__.py
2 parents c0d37f3 + 8d142c5 commit 0647c68

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+15905
-239
lines changed

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,6 @@ ffmpeg \
7373

7474
Real-world signal graphs can get a heck of a lot more complex, but `ffmpeg-python` handles them with ease.
7575

76+
77+
# [API Reference](https://kkroening.github.io/ffmpeg-python/)
78+

‎doc/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
doctrees
2+
gh-pages

‎doc/Makefile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = python -msphinx
7+
SPHINXPROJ = ffmpeg-python
8+
SOURCEDIR = src
9+
BUILDDIR = .
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@rm -rf html doctrees
21+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
22+
23+
24+
update-gh-pages:
25+
@./update-gh-pages.sh

‎doc/html/.buildinfo

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Sphinx build info version 1
2+
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3+
config: 50f5f60eba4389f450cae1cdd5d95392
4+
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎doc/html/_sources/index.rst.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
ffmpeg-python: Python bindings for FFmpeg
2+
=========================================
3+
4+
.. toctree::
5+
:maxdepth: 2
6+
:caption: Contents:
7+
8+
.. automodule:: ffmpeg
9+
:members:
10+
:undoc-members:
11+
:show-inheritance:
12+
13+
14+
Indices and tables
15+
==================
16+
17+
* :ref:`genindex`
18+
* :ref:`modindex`
19+
* :ref:`search`

‎doc/html/_static/ajax-loader.gif

673 Bytes
Loading

0 commit comments

Comments
 (0)
0