diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2017-05-19 03:21:46 -0300 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2017-05-19 03:21:46 -0300 |
| commit | 532a08904ffbacc5e5ccf99edb660c5f37ddb213 (patch) | |
| tree | 12399229cfa94b847a3ba07fcdca2336e5adc5b0 /youtube_dl/extractor/bbc.py | |
| parent | 97a8fc3ae80fb363c69c2e6b8c29b5373ac72aea (diff) | |
| parent | d9d7cd0e85dc712461d9185db9df9d6c900a573b (diff) | |
| download | youtube-dl-532a08904ffbacc5e5ccf99edb660c5f37ddb213.zip youtube-dl-532a08904ffbacc5e5ccf99edb660c5f37ddb213.tar.gz youtube-dl-532a08904ffbacc5e5ccf99edb660c5f37ddb213.tar.bz2 | |
Merge tag 'upstream/2017.05.18.1'
Upstream version 2017.05.18.1
Diffstat (limited to 'youtube_dl/extractor/bbc.py')
| -rw-r--r-- | youtube_dl/extractor/bbc.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py index 8a2ed0a..dd65b8d 100644 --- a/youtube_dl/extractor/bbc.py +++ b/youtube_dl/extractor/bbc.py @@ -361,7 +361,7 @@ class BBCCoUkIE(InfoExtractor): fmt.update({ 'width': width, 'height': height, - 'vbr': bitrate, + 'tbr': bitrate, 'vcodec': encoding, }) else: @@ -370,7 +370,7 @@ class BBCCoUkIE(InfoExtractor): 'acodec': encoding, 'vcodec': 'none', }) - if protocol == 'http': + if protocol in ('http', 'https'): # Direct link fmt.update({ 'url': href, @@ -389,6 +389,8 @@ class BBCCoUkIE(InfoExtractor): 'rtmp_live': False, 'ext': 'flv', }) + else: + continue formats.append(fmt) elif kind == 'captions': subtitles = self.extract_subtitles(media, programme_id) @@ -407,7 +409,7 @@ class BBCCoUkIE(InfoExtractor): description = smp_config['summary'] for item in smp_config['items']: kind = item['kind'] - if kind != 'programme' and kind != 'radioProgramme': + if kind not in ('programme', 'radioProgramme'): continue programme_id = item.get('vpid') duration = int_or_none(item.get('duration')) @@ -448,7 +450,7 @@ class BBCCoUkIE(InfoExtractor): for item in self._extract_items(playlist): kind = item.get('kind') - if kind != 'programme' and kind != 'radioProgramme': + if kind not in ('programme', 'radioProgramme'): continue title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS) |