From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 8 Jan 2015 15:15:08 +0000 (+0100)
Subject: release 2015.01.08
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=11497d5bba4a8a99d5a1907d2a34fe7be7e04c37;p=youtube-dl

release 2015.01.08
---

diff --git a/README.md b/README.md
index 1df4fe2f1..24b4d7970 100644
--- a/README.md
+++ b/README.md
@@ -248,14 +248,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 , -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
+                                     preference using slashes, as in -f 22/17/18
+                                     .  Instead of format codes, you can select
+                                     by extension for the extensions aac, m4a,
+                                     mp3, mp4, ogg, wav, webm. You can also use
+                                     the special names "best", "bestvideo",
+                                     "bestaudio", "worst".  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.
                                      You can merge the video and audio of two
                                      formats into a single file using -f <video-
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 164ce0268..32019e362 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2015.01.07.2'
+__version__ = '2015.01.08'