Merge tag 'upstream/2015.11.27.1'

[youtubedl] / youtube-dl.1

diff --git a/youtube-dl.1 b/youtube-dl.1
index 78efa3d315b6bc174d794d66437ebb6707a69838..d5967c8bfb8637e762fd0c4f0dd2f5b0726d36dd 100644 (file)
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -636,7 +636,7 @@ Prefer free video formats unless a specific one is requested
 .RE
 .TP
 .B \-F, \-\-list\-formats
 .RE
 .TP
 .B \-F, \-\-list\-formats

-List all available formats
+List all available formats of specified videos

 .RS
 .RE
 .TP
 .RS
 .RE
 .TP


@@ -660,7 +660,7 @@ Write subtitle file
 .RE
 .TP
 .B \-\-write\-auto\-sub
 .RE
 .TP
 .B \-\-write\-auto\-sub

-Write automatic subtitle file (YouTube only)
+Write automatically generated subtitle file (YouTube only)

 .RS
 .RE
 .TP
 .RS
 .RE
 .TP


@@ -1132,6 +1132,20 @@ We\[aq]re considering to provide a way to let you solve the
 CAPTCHA (https://github.com/rg3/youtube-dl/issues/154), but at the
 moment, your best course of action is pointing a webbrowser to the
 youtube URL, solving the CAPTCHA, and restart youtube\-dl.
 CAPTCHA (https://github.com/rg3/youtube-dl/issues/154), but at the
 moment, your best course of action is pointing a webbrowser to the
 youtube URL, solving the CAPTCHA, and restart youtube\-dl.

+.SS Do I need any other programs?
+.PP
+youtube\-dl works fine on its own on most sites.
+However, if you want to convert video/audio, you\[aq]ll need
+avconv (https://libav.org/) or ffmpeg (https://www.ffmpeg.org/).
+On some sites \- most notably YouTube \- videos can be retrieved in a
+higher quality format without sound.
+youtube\-dl will detect whether avconv/ffmpeg is present and
+automatically pick the best option.
+.PP
+Videos or video formats streamed via RTMP protocol can only be
+downloaded when rtmpdump (https://rtmpdump.mplayerhq.hu/) is installed.
+Downloading MMS and RTSP videos requires either
+mplayer (http://mplayerhq.hu/) or mpv (https://mpv.io/) to be installed.

 .SS I have downloaded a video but how can I play it?
 .PP
 Once the video is fully downloaded, use any video player, such as
 .SS I have downloaded a video but how can I play it?
 .PP
 Once the video is fully downloaded, use any video player, such as