X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fprosiebensat1.py;h=3f585bebf86d68abec429aa6f3d9c91e5a9f028b;hb=a4ff6c4762fd01b606d54a2962530c753d4c52ec;hp=ec31ee7d1e22cbf526a0d9ed19af03e8357e4663;hpb=0c7214c40432a634f86a9da4ee1ef0c83d62dc5e;p=youtube-dl.git diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index ec31ee7d1..3f585bebf 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -51,14 +51,14 @@ class ProSiebenSat1IE(InfoExtractor): 'skip': 'Seems to be broken', }, { - 'url': 'http://www.prosiebenmaxx.de/yep/one-piece/video/148-folge-48-gold-rogers-heimat-ganze-folge', + 'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge', 'info_dict': { - 'id': '2437108', + 'id': '2429369', 'ext': 'mp4', - 'title': 'Folge 48: Gold Rogers Heimat', - 'description': 'Ruffy erreicht die Insel, auf der der berühmte Gold Roger lebte und hingerichtet wurde.', - 'upload_date': '20140226', - 'duration': 1401.48, + 'title': 'Countdown für die Autowerkstatt', + 'description': 'md5:809fc051a457b5d8666013bc40698817', + 'upload_date': '20140223', + 'duration': 2595.04, }, 'params': { # rtmp download @@ -263,8 +263,9 @@ class ProSiebenSat1IE(InfoExtractor): return bitrate / 1000 if bitrate % 1000 == 0 else bitrate for source in urls_sources: - if source['protocol'] == 'rtmp': - mobj = re.search(r'^(?Prtmp://[^/]+/(?P[^/]+))/(?P.+)$', source['url']) + protocol = source['protocol'] + if protocol == 'rtmp' or protocol == 'rtmpe': + mobj = re.search(r'^(?Prtmpe?://[^/]+/(?P[^/]+))/(?P.+)$', source['url']) if not mobj: continue formats.append({ @@ -280,7 +281,7 @@ class ProSiebenSat1IE(InfoExtractor): else: formats.append({ 'url': source['url'], - 'vbr': fix_bitrate(sources['bitrate']), + 'vbr': fix_bitrate(source['bitrate']), }) self._sort_formats(formats)