diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-22 19:58:31 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-22 19:58:31 +0100 |
| commit | 50317b111dadccba73bcdd828d9997d1da78a5f1 (patch) | |
| tree | c3504ea6f73ef1d44934a58e7a2e4c752a0f98b3 /youtube_dl/utils.py | |
| parent | d7975ea28785e1d2c344ee65acff873edb43e914 (diff) | |
| parent | dd27fd1739ad7fed878ecab17e51001c336d1190 (diff) | |
| download | youtube-dl-50317b111dadccba73bcdd828d9997d1da78a5f1.tar.xz | |
Merge branch 'youtube-dash-manifest'
Conflicts:
youtube_dl/extractor/youtube.py
Diffstat (limited to 'youtube_dl/utils.py')
| -rw-r--r-- | youtube_dl/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 6c00973bd..3d2903986 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1131,8 +1131,8 @@ class HEADRequest(compat_urllib_request.Request): return "HEAD" -def int_or_none(v): - return v if v is None else int(v) +def int_or_none(v, scale=1): + return v if v is None else (int(v) // scale) def parse_duration(s): |