mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-03 00:00:44 +02:00
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: youtube_dl/extractor/arte.py
This commit is contained in:
commit
b8a792de80
|
@ -40,8 +40,9 @@ def _real_extract(self, url):
|
||||||
formats = [{
|
formats = [{
|
||||||
'forma_id': q.attrib['quality'],
|
'forma_id': q.attrib['quality'],
|
||||||
'url': q.text,
|
'url': q.text,
|
||||||
|
'ext': 'flv',
|
||||||
'quality': 2 if q.attrib['quality'] == 'hd' else 1,
|
'quality': 2 if q.attrib['quality'] == 'hd' else 1,
|
||||||
} for q in config.findall('.//quality')]
|
} for q in config.findall('./urls/url')]
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
title = config.find('.//name').text
|
title = config.find('.//name').text
|
||||||
|
@ -51,7 +52,6 @@ def _real_extract(self, url):
|
||||||
'title': title,
|
'title': title,
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'ext': 'flv',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user