nhyatt/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-06-30 11:02:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'youtube-dash-manifest'

Browse Source 
Conflicts:
	youtube_dl/extractor/youtube.py
This commit is contained in:
Philipp Hagemeister
2014-01-22 19:58:31 +01:00
parent d7975ea287 dd27fd1739
commit 50317b111d
4 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/utils.py
View File

@ -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):