Merge pull request #69 from amiaopensource/retokromer-patch-1

little HTML5 housekeeping
This commit is contained in:
Ashley 2016-07-01 10:43:14 -04:00 committed by GitHub
commit f91936a133

View File

@ -34,8 +34,8 @@
<div class="well col-md-8 col-md-offset-0"> <div class="well col-md-8 col-md-offset-0">
<div class="well"> <div class="well">
<h3>What do you want to do?</h3> <h3>What do you want to do?</h3>
<h6>Select from the following.</h6> <h6>Select from the following.</h6>
</div> </div>
<div class="well"><h4>Change formats</h4> <div class="well"><h4>Change formats</h4>
@ -754,7 +754,7 @@
<dl> <dl>
<dt>ffmpeg</dt><dd>starts the command</dd> <dt>ffmpeg</dt><dd>starts the command</dd>
<dt>-f concat</dt><dd>forces ffmpeg to concatenate the files and to keep the same file format</dd> <dt>-f concat</dt><dd>forces ffmpeg to concatenate the files and to keep the same file format</dd>
<dt>-i <i>mylist.txt</i></dt><dd>path, name and extension of the input file. Per the <a href="https://www.ffmpeg.org/ffmpeg-formats.html#Options">ffmpeg documentation</a>, it is preferable to specify relative rather than absolute file paths, as allowing absolute file paths may pose a security risk.<br> <dt>-i <i>mylist.txt</i></dt><dd>path, name and extension of the input file. Per the <a href="https://www.ffmpeg.org/ffmpeg-formats.html#Options">ffmpeg documentation</a>, it is preferable to specify relative rather than absolute file paths, as allowing absolute file paths may pose a security risk.<br/>
This text file contains the list of files to be concatenated and should be formatted as follows: This text file contains the list of files to be concatenated and should be formatted as follows:
<pre>file '<i>./first_file.ext</i>' <pre>file '<i>./first_file.ext</i>'
file '<i>./second_file.ext</i>' file '<i>./second_file.ext</i>'