|
|
@ -851,6 +851,7 @@ class InfoExtractor(object):
|
|
|
|
proto_preference = 0 if determine_protocol(f) in ['http', 'https'] else -0.1
|
|
|
|
proto_preference = 0 if determine_protocol(f) in ['http', 'https'] else -0.1
|
|
|
|
|
|
|
|
|
|
|
|
if f.get('vcodec') == 'none': # audio only
|
|
|
|
if f.get('vcodec') == 'none': # audio only
|
|
|
|
|
|
|
|
preference -= 50
|
|
|
|
if self._downloader.params.get('prefer_free_formats'):
|
|
|
|
if self._downloader.params.get('prefer_free_formats'):
|
|
|
|
ORDER = ['aac', 'mp3', 'm4a', 'webm', 'ogg', 'opus']
|
|
|
|
ORDER = ['aac', 'mp3', 'm4a', 'webm', 'ogg', 'opus']
|
|
|
|
else:
|
|
|
|
else:
|
|
|
@ -861,6 +862,8 @@ class InfoExtractor(object):
|
|
|
|
except ValueError:
|
|
|
|
except ValueError:
|
|
|
|
audio_ext_preference = -1
|
|
|
|
audio_ext_preference = -1
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
|
|
|
|
if f.get('acodec') == 'none': # video only
|
|
|
|
|
|
|
|
preference -= 40
|
|
|
|
if self._downloader.params.get('prefer_free_formats'):
|
|
|
|
if self._downloader.params.get('prefer_free_formats'):
|
|
|
|
ORDER = ['flv', 'mp4', 'webm']
|
|
|
|
ORDER = ['flv', 'mp4', 'webm']
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|