From: rzhxeo <rzhxeot7z81b4700@mailcatch.com>
Date: Wed, 18 Dec 2013 20:25:13 +0000 (+0100)
Subject: Make prefer_free_formats sorting more robust
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=62d68c43ed76fab391eacfd52f0391936ef0a4dc;p=youtube-dl

Make prefer_free_formats sorting more robust
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index fd26f00b7..a93dd41a3 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -674,7 +674,9 @@ class YoutubeDL(object):
                 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)
+                return (f.get('height') if f.get('height') is not None else -1,
+                        f.get('width') if f.get('width') is not None else -1,
+                        ext_ord)
             formats = sorted(formats, key=_free_formats_key)
 
         info_dict['formats'] = formats