8000 Update docs · ArchieMeng/ffmpeg-python@dcebe91 · GitHub
[go: up one dir, main page]
Skip to content

Commit dcebe91

Browse files
kkroeningkkroening
committed
Update docs
1 parent d4b8900 commit dcebe91

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

‎doc/html/genindex.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ <h3>Navigation</h3>
228228
</div>
229229
<div class="footer" role="contentinfo">
230230
&#169; Copyright 2017, Karl Kroening.
231-
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.1.
231+
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.2.
232232
</div>
233233
</body>
234234
</html>

‎doc/html/index.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ <h1>ffmpeg-python: Python bindings for FFmpeg<a class="headerlink" href="#ffmpeg
207207

208208
<dl class="function">
209209
<dt id="ffmpeg.overlay">
210-
<code class="descclassname">ffmpeg.</code><code class="descname">overlay</code><span class="sig-paren">(</span><em>main_parent_node</em>, <em>overlay_parent_node</em>, <em>eof_action=’repeat’</em>, <em>**kwargs</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.overlay" title="Permalink to this definition"></a></dt>
210+
<code class="descclassname">ffmpeg.</code><code class="descname">overlay</code><span class="sig-paren">(</span><em>main_parent_node</em>, <em>overlay_parent_node</em>, <em>eof_action=u’repeat’</em>, <em>**kwargs</em> 8000 <span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.overlay" title="Permalink to this definition"></a></dt>
211211
<dd><p>Overlay one video on top of another.</p>
212212
<table class="docutils field-list" frame="void" rules="none">
213213
<col class="field-name" />
@@ -341,19 +341,20 @@ <h1>ffmpeg-python: Python bindings for FFmpeg<a class="headerlink" href="#ffmpeg
341341

342342
<dl class="function">
343343
<dt id="ffmpeg.input">
344-
<code class="descclassname">ffmpeg.</code><code class="descname">input</code><span class="sig-paren">(</span><em>filename</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.input" title="Permalink to this definition"></a></dt>
344+
<code class="descclassname">ffmpeg.</code><code class="descname">input</code><span class="sig-paren">(</span><em>filename</em>, <em>**kwargs</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.input" title="Permalink to this definition"></a></dt>
345345
<dd><p>Input file URL (ffmpeg <code class="docutils literal"><span class="pre">-i</span></code> option)</p>
346346
<p>Official documentation: <a class="reference external" href="https://ffmpeg.org/ffmpeg.html#Main-options">Main options</a></p>
347347
</dd></dl>
348348

349349
<dl class="function">
350350
<dt id="ffmpeg.merge_outputs">
351351
<code class="descclassname">ffmpeg.</code><code class="descname">merge_outputs</code><span class="sig-paren">(</span><em>*parent_nodes</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.merge_outputs" title="Permalink to this definition"></a></dt>
352-
<dd></dd></dl>
352+
<dd><p>Include all given outputs in one ffmpeg command line</p>
353+
</dd></dl>
353354

354355
<dl class="function">
355356
<dt id="ffmpeg.output">
356-
<code class="descclassname">ffmpeg.</code><code class="descname">output</code><span class="sig-paren">(</span><em>parent_node</em>, <em>filename</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.output" title="Permalink to this definition"></a></dt>
357+
<code class="descclassname">ffmpeg.</code><code class="descname">output</code><span class="sig-paren">(</span><em>parent_node</em>, <em>filename</em>, <em>**kwargs</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.output" title="Permalink to this definition"></a></dt>
357358
<dd><p>Output file URL</p>
358359
<p>Official documentation: <a class="reference external" href="https://ffmpeg.org/ffmpeg.html#Synopsis">Synopsis</a></p>
359360
</dd></dl>
@@ -373,7 +374,7 @@ <h1>ffmpeg-python: Python bindings for FFmpeg<a class="headerlink" href="#ffmpeg
373374

374375
<dl class="function">
375376
<dt id="ffmpeg.run">
376-
<code class="descclassname">ffmpeg.</code><code class="descname">run</code><span class="sig-paren">(</span><em>node</em>, <em>cmd=’ffmpeg’</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.run" title="Permalink to this definition"></a></dt>
377+
<code class="descclassname">ffmpeg.</code><code class="descname">run</code><span class="sig-paren">(</span><em>node</em>, <em>cmd=u’ffmpeg’</em><span class="sig-paren">)</span><a class="headerlink" href="#ffmpeg.run" title="Permalink to this definition"></a></dt>
377378
<dd><p>Run ffmpeg on node graph.</p>
378379
</dd></dl>
379380

@@ -434,7 +435,7 @@ <h3>Navigation</h3>
434435
</div>
435436
<div class="footer" role="contentinfo">
436437
&#169; Copyright 2017, Karl Kroening.
437-
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.1.
438+
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.2.
438439
</div>
439440
</body>
440441
</html>

‎doc/html/py-modindex.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h3>Navigation</h3>
105105
</div>
106106
<div class="footer" role="contentinfo">
107107
&#169; Copyright 2017, Karl Kroening.
108-
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.1.
108+
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.2.
109109
</div>
110110
</body>
111111
</html>

‎doc/html/search.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h3>Navigation</h3>
101101
</div>
102102
<div class="footer" role="contentinfo">
103103
&#169; Copyright 2017, Karl Kroening.
104-
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.1.
104+
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.6.2.
105105
</div>
106106
</body>
107107
</html>

‎doc/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0