Merge tag 'upstream/2013.10.23'

[youtubedl] / youtube_dl / extractor / dreisat.py

diff --git a/youtube_dl/extractor/dreisat.py b/youtube_dl/extractor/dreisat.py
index 847f733a78e44a423a7bfa8be3409f3fe01c9365..765cb1f377df132ee91deac5872877777187cd6a 100644 (file)
--- a/youtube_dl/extractor/dreisat.py
+++ b/youtube_dl/extractor/dreisat.py
@@ -54,6 +54,7 @@ class DreiSatIE(InfoExtractor):
             'width': int(fe.find('./width').text),
             'height': int(fe.find('./height').text),
             'url': fe.find('./url').text,
             'width': int(fe.find('./width').text),
             'height': int(fe.find('./height').text),
             'url': fe.find('./url').text,

+            'ext': determine_ext(fe.find('./url').text),

             'filesize': int(fe.find('./filesize').text),
             'video_bitrate': int(fe.find('./videoBitrate').text),
             '3sat_qualityname': fe.find('./quality').text,
             'filesize': int(fe.find('./filesize').text),
             'video_bitrate': int(fe.find('./videoBitrate').text),
             '3sat_qualityname': fe.find('./quality').text,


@@ -67,6 +68,7 @@ class DreiSatIE(InfoExtractor):
         formats.sort(key=_sortkey)
 
         info = {
         formats.sort(key=_sortkey)
 
         info = {

+            '_type': 'video',

             'id': video_id,
             'title': video_title,
             'formats': formats,
             'id': video_id,
             'title': video_title,
             'formats': formats,


@@ -78,7 +80,6 @@ class DreiSatIE(InfoExtractor):
         }
 
         # TODO: Remove when #980 has been merged
         }
 
         # TODO: Remove when #980 has been merged

-        info['url'] = formats[-1]['url']
-        info['ext'] = determine_ext(formats[-1]['url'])
+        info.update(formats[-1])

 
 

-        return self.video_result(info)
\ No newline at end of file
+        return info