Browse Source

Make prefer_free_formats sorting more robust

totalwebcasting
rzhxeo 11 years ago
parent
commit
62d68c43ed
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      youtube_dl/YoutubeDL.py

+ 3
- 1
youtube_dl/YoutubeDL.py View File

@ -674,7 +674,9 @@ class YoutubeDL(object):
except ValueError: except ValueError:
ext_ord = -1 ext_ord = -1
# We only compare the extension if they have the same height and width # 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) formats = sorted(formats, key=_free_formats_key)
info_dict['formats'] = formats info_dict['formats'] = formats


Loading…
Cancel
Save