aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-22 19:58:31 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-22 19:58:31 +0100
commit50317b111dadccba73bcdd828d9997d1da78a5f1 (patch)
treec3504ea6f73ef1d44934a58e7a2e4c752a0f98b3 /youtube_dl/YoutubeDL.py
parentd7975ea28785e1d2c344ee65acff873edb43e914 (diff)
parentdd27fd1739ad7fed878ecab17e51001c336d1190 (diff)
downloadyoutube-dl-50317b111dadccba73bcdd828d9997d1da78a5f1.tar.xz
Merge branch 'youtube-dash-manifest'
Conflicts: youtube_dl/extractor/youtube.py
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rw-r--r--youtube_dl/YoutubeDL.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 1491f8908..87e7d21d6 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1106,6 +1106,8 @@ class YoutubeDL(object):
res += 'audio'
if fdict.get('abr') is not None:
res += '@%3dk' % fdict['abr']
+ if fdict.get('asr') is not None:
+ res += ' (%5dHz)' % fdict['asr']
if fdict.get('filesize') is not None:
if res:
res += ', '