summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/youtube-dl/youtube-dl.118
-rw-r--r--network/youtube-dl/youtube-dl.SlackBuild2
-rw-r--r--network/youtube-dl/youtube-dl.info6
3 files changed, 20 insertions, 6 deletions
diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1
index 78efa3d315..d5967c8bfb 100644
--- a/network/youtube-dl/youtube-dl.1
+++ b/network/youtube-dl/youtube-dl.1
@@ -636,7 +636,7 @@ Prefer free video formats unless a specific one is requested
.RE
.TP
.B \-F, \-\-list\-formats
-List all available formats
+List all available formats of specified videos
.RS
.RE
.TP
@@ -660,7 +660,7 @@ Write subtitle file
.RE
.TP
.B \-\-write\-auto\-sub
-Write automatic subtitle file (YouTube only)
+Write automatically generated subtitle file (YouTube only)
.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.
+.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
diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild
index d17165486d..6dd7a2cea3 100644
--- a/network/youtube-dl/youtube-dl.SlackBuild
+++ b/network/youtube-dl/youtube-dl.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=youtube-dl
-VERSION=${VERSION:-2015.11.19}
+VERSION=${VERSION:-2015.11.27.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info
index cab8eda4ac..0d7f0a7f6d 100644
--- a/network/youtube-dl/youtube-dl.info
+++ b/network/youtube-dl/youtube-dl.info
@@ -1,8 +1,8 @@
PRGNAM="youtube-dl"
-VERSION="2015.11.19"
+VERSION="2015.11.27.1"
HOMEPAGE="https://rg3.github.io/youtube-dl"
-DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.11.19.tar.gz"
-MD5SUM="33581df12fa8539ca9f7bb96540c9c6a"
+DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.11.27.1.tar.gz"
+MD5SUM="1f4a153050bd923647fbce11b47fe876"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""