aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-09-03 18:52:12 -0700
committerPhilipp Hagemeister <phihag@phihag.de>2013-09-03 18:52:12 -0700
commit5d5171d26abb1ffdf0049bc0482baa23f4501c30 (patch)
tree1779879db98b353a7b6afb0f0a031990bc5a3b95 /youtube_dl/__init__.py
parent7011de0bc2d25487bc9c30975925ac5a3503e785 (diff)
parent96fb5605b29c5029ab2894b5722c0937e320a3c0 (diff)
Merge pull request #1341 from xanadu/master
add support for "-f mp4" for YouTube
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 431460c57..b6b12683f 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -192,7 +192,7 @@ def parseOpts(overrideArguments=None):
video_format.add_option('-f', '--format',
action='store', dest='format', metavar='FORMAT',
- help='video format code, specifiy the order of preference using slashes: "-f 22/17/18"')
+ help='video format code, specifiy the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')
video_format.add_option('--all-formats',
action='store_const', dest='format', help='download all available video formats', const='all')
video_format.add_option('--prefer-free-formats',