diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-01-30 16:25:55 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-01-30 16:25:55 +0800 |
| commit | 8bf39420b4712c33aff45abba4a910e7e58cba5a (patch) | |
| tree | c5bf40f9baea503b9a78affabac1792bf55659f8 /youtube_dl/extractor/common.py | |
| parent | 71d08b3e2955683ce0222473dff358496798f5b5 (diff) | |
| parent | 83ab8a79ccc3b6ef143f7d636c0118f7c3e5777b (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 33290fd74..b3d57dfce 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -828,7 +828,7 @@ class InfoExtractor(object): for f in formats: # Automatically determine tbr when missing based on abr and vbr (improves # formats sorting in some cases) - if 'tbr' not in f and 'abr' in f and 'vbr' in f: + if 'tbr' not in f and f.get('abr') is not None and f.get('vbr') is not None: f['tbr'] = f['abr'] + f['vbr'] def _formats_key(f): |