aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-14 17:24:18 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-10-11 16:34:49 +0200
commite028d0d1e3ffed0a323b41431dbbfc804aa9553e (patch)
tree641ff81735b48dbbcf6b713e9edc2f4083cd141d /youtube_dl
parent79819f58f2328cdb08272c55d01965cd8c6624ba (diff)
Implement the prefer_free_formats in YoutubeDL
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/YoutubeDL.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 829a70ec9..e159aa336 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -484,6 +484,15 @@ class YoutubeDL(object):
format_limit = self.params.get('format_limit', None)
if format_limit:
formats = [f for f in formats if f['format_id'] <= format_limit]
+ if self.params.get('prefer_free_formats'):
+ def _free_formats_key(f):
+ try:
+ ext_ord = [u'flv', u'mp4', u'webm'].index(f['ext'])
+ except ValueError:
+ ext_ord = -1
+ # We only compare the extension if they have the same height and width
+ return (f.get('height'), f.get('width'), ext_ord)
+ formats = sorted(formats, key=_free_formats_key)
req_format = self.params.get('format', 'best')
formats_to_download = []