Make prefer_free_formats sorting more robust

2013-12-18 21:25:13 +01:00 · 2013-12-18 21:25:13 +01:00 · 62d68c43ed
commit 62d68c43ed
parent bfaae0a768
1 changed files with 3 additions and 1 deletions
--- 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