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

Conflicts:
	youtube_dl/extractor/arte.py

diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index 9ca6c71e924b80af9e2e6dfcd0f70f201b13708d..646377e4b0f16c9b3628987b51c3ff530c12b297 100644 (file)
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -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',
         }