Removed link to MIDI on Linux page in Mackie Control setup page.

[ardour-manual] / include / transcoding-formats-amp-codecs.html

diff --git a/include/transcoding-formats-amp-codecs.html b/include/transcoding-formats-amp-codecs.html
index 2a78a92ba35912bcbba204e99071419bb7642077..9373ec6dc6e06084b008f6dd68211e04172b06d4 100644 (file)
--- a/include/transcoding-formats-amp-codecs.html
+++ b/include/transcoding-formats-amp-codecs.html
@@ -1,13 +1,14 @@
 
 <p>
   This chapter provides a short primer on video files, formats and
-  codecs – because it is often cause for confusion:
+  codecs &ndash; because it is often cause for confusion:
 </p>
 
 <p>
   A video file is a <dfn>container</dfn>. It usually contains one
-  <dfn>video track</dfn> and one or more <dfn>audio tracks</dfn>.
-  How these tracks are stored in the file is defined by the
+  <dfn>video track</dfn>, one or more <dfn>audio tracks</dfn>, and possibly <dfn>
+  subtitle</dfn> tracks, <dfn>chapters</dfn>&hellip;
+  The way these tracks are stored in the file is defined by the
   <dfn>file format</dfn>. Common formats are
   avi, mov, ogg, mkv, mpeg, mpeg-ts, mp4, flv, or vob.
 </p>
@@ -20,7 +21,7 @@
 <p>
   Not all codecs can be packed into a given format. For example the
   mpeg format is limited to mpeg2, mpeg4 and mp3 codecs (not entirely true).
-  DVDs do have stringent limitations as well. The opposite would be .avi;
+  DVDs do have stringent limitations as well. The opposite would be .avi:
   pretty much every audio/video codec combination can be contained in an avi
   file-format.
 </p>
@@ -47,8 +48,8 @@
 </p>
 <p>
   The export dialog includes presets for common format and codec
-  combinations (such as DVD, web-video,..). If in doubt use one of the
-  presets.
+  combinations (such as DVD, web-video,..). If in doubt, one of the
+  presets should be used.
 </p>
 <p>
   As a last note: every time a video is transcoded, the quality can only get
@@ -56,4 +57,3 @@
   title="Multiplexing Audio and Video">muxing</abbr> process, one should
   always go back and use the original source of the video.
 </p>
-