aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-08 23:42:52 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-08 23:42:52 +0100
commitd420d8dd1bbe375ebe7048e70f5f47e6c5bbc5cf (patch)
treef36f2d6fd53e27a79c8a0d01fbc018d298871340
parent3fabeaa1f49d6ce15d67bfe31cad80002cdc5c94 (diff)
release 2014.01.082014.01.08
-rw-r--r--README.md4
-rw-r--r--youtube_dl/version.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index 7a214ef17..18ac4e308 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,10 @@ which means you can modify it, redistribute it or use it however you like.
--add-metadata write metadata to the video file
--xattrs write metadata to the video file's xattrs (using
dublin core and xdg standards)
+ --prefer-avconv Prefer avconv over ffmpeg for running the
+ postprocessors (default)
+ --prefer-ffmpeg Prefer ffmpeg over avconv for running the
+ postprocessors
# CONFIGURATION
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index a82e2280c..d1233be65 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
-__version__ = '2014.01.07.5'
+__version__ = '2014.01.08'