diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-10-30 09:34:13 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-10-30 09:34:13 +0100 |
| commit | fbb21cf528fe5cc4ba72f97f691cdf7ec20ee0e6 (patch) | |
| tree | dad70295b7cf0e1997990a65051f4a544a7979a4 | |
| parent | b8a618f898b42e317b2abb13e33f60641d75a762 (diff) | |
| download | youtube-dl-fbb21cf528fe5cc4ba72f97f691cdf7ec20ee0e6.tar.xz | |
[youtube] Add formats 298, 299 (Fixes #4056)
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/common.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index fd775b9fd..73a372df4 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1211,6 +1211,8 @@ class YoutubeDL(object): res += 'video@' if fdict.get('vbr') is not None: res += '%4dk' % fdict['vbr'] + if fdict.get('fps') is not None: + res += ', %sfps' % fdict['fps'] if fdict.get('acodec') is not None: if res: res += ', ' diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index b77db52f7..3300734bc 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -72,6 +72,7 @@ class InfoExtractor(object): * acodec Name of the audio codec in use * asr Audio sampling rate in Hertz * vbr Average video bitrate in KBit/s + * fps Frame rate * vcodec Name of the video codec in use * container Name of the container format * filesize The number of bytes, if known in advance diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 40fe4662a..fbd9311fe 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -302,6 +302,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): '171': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 128, 'preference': -50}, '172': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 256, 'preference': -50}, + # Dash mov + '298': {'ext': 'mov', 'height': 720, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40, 'fps': 60, 'vcodec': 'h264'}, + '299': {'ext': 'mov', 'height': 1080, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40, 'fps': 60, 'vcodec': 'h264'}, + # RTMP (unnamed) '_rtmp': {'protocol': 'rtmp'}, } |