[extractor/common] Style

This commit is contained in:
Sergey M․ 2015-07-18 16:35:28 +06:00
parent b0bff54b08
commit 74fe23ec35

View File

@ -996,7 +996,7 @@ def _extract_smil_formats(self, smil_url, video_id, fatal=True):
def _parse_smil_video(self, video, video_id, base, rtmp_count): def _parse_smil_video(self, video, video_id, base, rtmp_count):
src = video.get('src') src = video.get('src')
if not src: if not src:
return ([], rtmp_count) return [], rtmp_count
bitrate = int_or_none(video.get('system-bitrate') or video.get('systemBitrate'), 1000) bitrate = int_or_none(video.get('system-bitrate') or video.get('systemBitrate'), 1000)
width = int_or_none(video.get('width')) width = int_or_none(video.get('width'))
height = int_or_none(video.get('height')) height = int_or_none(video.get('height'))
@ -1009,7 +1009,7 @@ def _parse_smil_video(self, video, video_id, base, rtmp_count):
proto = 'http' proto = 'http'
ext = video.get('ext') ext = video.get('ext')
if proto == 'm3u8': if proto == 'm3u8':
return (self._extract_m3u8_formats(src, video_id, ext), rtmp_count) return self._extract_m3u8_formats(src, video_id, ext), rtmp_count
elif proto == 'rtmp': elif proto == 'rtmp':
rtmp_count += 1 rtmp_count += 1
streamer = video.get('streamer') or base streamer = video.get('streamer') or base