X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fvideo-timeline-setup.html;h=c2d88ec53f1769367808d686758deff7d0b62b92;hb=88b8130ec83209b2db4cb837ab77156aa4bab6a0;hp=1c5c9931c036e61074b691a7fc7903600a9b1d5b;hpb=74636938f3f50b46d2052f91b95e875229816849;p=ardour-manual

diff --git a/include/video-timeline-setup.html b/include/video-timeline-setup.html
index 1c5c993..c2d88ec 100644
--- a/include/video-timeline-setup.html
+++ b/include/video-timeline-setup.html
@@ -22,13 +22,14 @@
     <a href="http://x42.github.io/harvid/" title="http://x42.github.io/harvid/"
     rel="nofollow">http://x42.github.com/harvid/</a></li>
   <li>ffmpeg, ffprobe (used to import/export video, extract soundtracks and query
-    video information): <a href="http://ffmpeg.org" title="http://ffmpeg.org"
+    video information and encode mp3 for export): <a
+    href="http://ffmpeg.org" title="http://ffmpeg.org"
     rel="nofollow">http://ffmpeg.org</a></li>
 </ul>
 
 <p>
   Ardour requires xjadeo &ge; version 0.6.4, harvid &ge; version 0.7.0 and
-  ffmpeg (known to work versions: 1.2, 2.8.2)
+  ffmpeg (known to work versions: 1.2, 2.8.2, 5.0)
 </p>
 
 <p>
@@ -41,23 +42,20 @@
 <p>
   All four applications need to be found in <code>$PATH</code> (e.g.
   <code>$HOME/bin</code> or <code>/usr/local/bin</code>). For convenience the
-  binary releases of harvid include ffmpeg_harvid and ffprobe_harvid, but if the
-  distribution provides suitable ffmpeg commands, symbolic links can be created
-  to the distribution-provided binaries:
+  binary releases of harvid include ffmpeg_harvid and ffprobe_harvid.
+  Ardour binaries from ardour.org do include all relevant tools and most
+  GNU/Linux distributions also provide those.
 </p>
 
-<kbd class="cmd lin">sudo ln -s /usr/bin/ffmpeg /usr/bin/ffmpeg_harvid</kbd>
-<kbd class="cmd lin">sudo ln -s /usr/bin/ffprobe /usr/bin/ffprobe_harvid</kbd>
-
 <p>
-  Binary releases are available from ardour.org as well as an installer script:
+  Binary releases of the video-tools are available from ardour.org via a dedicated installer script:
   <a href="https://github.com/Ardour/ardour/blob/master/tools/videotimeline/install_video_tools.sh"
   title="https://github.com/Ardour/ardour/blob/master/tools/videotimeline/install_video_tools.sh"
   rel="nofollow">install_video_tools.sh</a>.
 </p>
 
 <p>
-  The easiest way to install the video-utilities is by running the following
+  The easiest way to install the video-utilities on Linux is by running the following
   line in a terminal:
 </p>