commit 6ef9f88299e1595bbe467fb527ada9b003ae5779
parent f71fdb0acc0e168d2a5e4f60be96217647cc872e
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 05:51:22 +0100
release 2015.01.10
Diffstat:
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
@@ -272,6 +272,10 @@ which means you can modify it, redistribute it or use it however you like.
-F, --list-formats list all available formats
--youtube-skip-dash-manifest Do not download the DASH manifest on
YouTube videos
+ --merge-output-format FORMAT If a merge is required (e.g.
+ bestvideo+bestaudio), output to given
+ container format. One of mkv, mp4, ogg,
+ webm, flv.Ignored if no merge is required
## Subtitle Options:
--write-sub write subtitle file
@@ -318,6 +322,11 @@ 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)
+ --fixup POLICY (experimental) Automatically correct known
+ faults of the file. One of never (do
+ nothing), warn (only emit a warning),
+ detect_or_warn(check whether we can do
+ anything about it, warn otherwise
--prefer-avconv Prefer avconv over ffmpeg for running the
postprocessors (default)
--prefer-ffmpeg Prefer ffmpeg over avconv for running the
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-__version__ = '2015.01.09.2'
+__version__ = '2015.01.10'
