mirror
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl.git
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into HEAD 

Conflicts:
	youtube_dl/extractor/arte.py
This commit is contained in:
Philipp Hagemeister 2014-03-24 23:23:17 +01:00
parent fac55558ad b2799ff96d
commit b8a792de80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/arte.py
View File

@ -40,8 +40,9 @@ class ArteTvIE(InfoExtractor):
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 @@ class ArteTvIE(InfoExtractor):
'title': title, 'title': title,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'formats': formats, 'formats': formats,
'ext': 'flv',
} }