From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 24 Mar 2014 22:23:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into HEAD
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b8a792de80404e856139c8a1a801fb370e6ca0e5;hp=-c;p=youtube-dl

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

Conflicts:
	youtube_dl/extractor/arte.py
---

b8a792de80404e856139c8a1a801fb370e6ca0e5
diff --combined youtube_dl/extractor/arte.py
index 9ca6c71e9,2a123880e..646377e4b
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@@ -2,6 -2,7 +2,6 @@@
  from __future__ import unicode_literals
  
  import re
 -import json
  
  from .common import InfoExtractor
  from ..utils import (
@@@ -25,8 -26,8 +25,8 @@@ class ArteTvIE(InfoExtractor)
  
      def _real_extract(self, url):
          mobj = re.match(self._VALID_URL, url)
 -        video_id = mobj.group('id')
          lang = mobj.group('lang')
 +        video_id = mobj.group('id')
  
          ref_xml_url = url.replace('/videos/', '/do_delegate/videos/')
          ref_xml_url = ref_xml_url.replace('.html', ',view,asPlayerXml.xml')
@@@ -40,8 -41,9 +40,9 @@@
          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 -53,6 +52,6 @@@
              'title': title,
              'thumbnail': thumbnail,
              'formats': formats,
-             'ext': 'flv',
          }