mirror of
https://gitlab.com/dstftw/youtube-dl.git
synced 2020-11-16 09:42:26 +00: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 @@ class ArteTvIE(InfoExtractor):
|
|||
formats = [{
|
||||
'forma_id': q.attrib['quality'],
|
||||
'url': q.text,
|
||||
'ext': 'flv',
|
||||
'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)
|
||||
|
||||
title = config.find('.//name').text
|
||||
|
@ -51,7 +52,6 @@ class ArteTvIE(InfoExtractor):
|
|||
'title': title,
|
||||
'thumbnail': thumbnail,
|
||||
'formats': formats,
|
||||
'ext': 'flv',
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue