summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-01-10 23:20:26 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-01-10 23:20:26 +0100
commit280d67896a98dc62ea5268f99b3fb729b6d7acfa (patch)
treef2e0f17a16daf2cc9adc26faf0ccea3373947fc8
parent510e6f6dc19681c89a866562bb372032313bf272 (diff)
downloadyoutube-dl-280d67896a98dc62ea5268f99b3fb729b6d7acfa.tar.gz
youtube-dl-280d67896a98dc62ea5268f99b3fb729b6d7acfa.tar.xz
youtube-dl-280d67896a98dc62ea5268f99b3fb729b6d7acfa.zip
Correct documentation (Closes #625)
-rw-r--r--README.md10
-rwxr-xr-xyoutube-dlbin3447 -> 55751 bytes
2 files changed, 5 insertions, 5 deletions
diff --git a/README.md b/README.md
index b3cd9a38c..8fda07f77 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ youtube-dl
 # DESCRIPTION
 **youtube-dl** is a small command-line program to download videos from
 YouTube.com and a few more sites. It requires the Python interpreter, version
-2.x (x being at least 6), and it is not platform specific. It should work in
-your Unix box, in Windows or in Mac OS X. It is released to the public domain,
+2.6, 2.7, or 3.3+, and it is not platform specific. It should work on
+your Unix box, on Windows or on Mac OS X. It is released to the public domain,
 which means you can modify it, redistribute it or use it however you like.
 
 # OPTIONS
@@ -105,8 +105,8 @@ which means you can modify it, redistribute it or use it however you like.
 ## Post-processing Options:
     -x, --extract-audio      convert video files to audio-only files (requires
                              ffmpeg or avconv and ffprobe or avprobe)
-    --audio-format FORMAT    "best", "aac", "vorbis", "mp3", "m4a", or "wav";
-                             best by default
+    --audio-format FORMAT    "best", "aac", "vorbis", "mp3", "m4a", "opus", or
+                             "wav"; best by default
     --audio-quality QUALITY  ffmpeg/avconv audio quality specification, insert a
                              value between 0 (better) and 9 (worse) for VBR or a
                              specific bitrate like 128K (default 5)
@@ -117,7 +117,7 @@ which means you can modify it, redistribute it or use it however you like.
 
 # CONFIGURATION
 
-You can configure youtube-dl by placing default arguments (such as `--extract-audio --no-mtime` to always extract the audio and not copy the mtime) into `/etc/youtube-dl.conf` and/or `~/.local/config/youtube-dl.conf`.
+You can configure youtube-dl by placing default arguments (such as `--extract-audio --no-mtime` to always extract the audio and not copy the mtime) into `/etc/youtube-dl.conf` and/or `~/.config/youtube-dl.conf`.
 
 # OUTPUT TEMPLATE
 
diff --git a/youtube-dl b/youtube-dl
index e6f05c173..d87f13186 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files differ