aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-07-11 17:21:16 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-07-11 17:21:16 +0200
commit09018e19a596f3a39bf7d871d8bb14c185b2470b (patch)
tree6cefbb5184f4331193a00851bbb2c78e86b91dbb
parent345e37831c6d6e215986f956f5dbf0578773ed38 (diff)
release 2014.07.11.32014.07.11.3
-rw-r--r--README.md2
-rw-r--r--youtube_dl/version.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index dffdaa9dc..bc5e0f76d 100644
--- a/README.md
+++ b/README.md
@@ -255,7 +255,7 @@ which means you can modify it, redistribute it or use it however you like.
128K (default 5)
--recode-video FORMAT Encode the video to another format if
necessary (currently supported:
- mp4|flv|ogg|webm)
+ mp4|flv|ogg|webm|mkv)
-k, --keep-video keeps the video file on disk after the
post-processing; the video is erased by
default
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 7ea6e7d43..2c9591630 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
-__version__ = '2014.07.11.2'
+__version__ = '2014.07.11.3'