aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-18 18:43:59 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-18 18:43:59 +0200
commitfd78a4d3e63f191e0774584d9b71bf25a2d8dbcf (patch)
tree643eca7cd182e327146c665737cb5cde3ce8e79b
parent1de33fafd94c7e0d4ccede711ef7f13bd3e2301b (diff)
release 2014.09.182014.09.18
-rw-r--r--README.md15
-rw-r--r--youtube_dl/version.py2
2 files changed, 10 insertions, 7 deletions
diff --git a/README.md b/README.md
index 5cc959ac5..5d15decb5 100644
--- a/README.md
+++ b/README.md
@@ -227,12 +227,15 @@ which means you can modify it, redistribute it or use it however you like.
## Video Format Options:
-f, --format FORMAT video format code, specify the order of
- preference using slashes: "-f 22/17/18".
- "-f mp4" and "-f flv" are also supported.
- You can also use the special names "best",
- "bestvideo", "bestaudio", "worst",
- "worstvideo" and "worstaudio". By default,
- youtube-dl will pick the best quality.
+ preference using slashes: -f 22/17/18 . -f
+ mp4 , -f m4a and -f flv are also
+ supported. You can also use the special
+ names "best", "bestvideo", "bestaudio",
+ "worst", "worstvideo" and "worstaudio". By
+ default, youtube-dl will pick the best
+ quality. Use commas to download multiple
+ audio formats, such as -f
+ 136/137/mp4/bestvideo,140/m4a/bestaudio
--all-formats download all available video formats
--prefer-free-formats prefer free video formats unless a specific
one is requested
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 23892a8bd..430509ba3 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
-__version__ = '2014.09.16.1'
+__version__ = '2014.09.18'