Merge branch 'youtube-dash-manifest'

Conflicts: youtube_dl/extractor/youtube.py
2014-01-22 19:58:31 +01:00
parent d7975ea287 dd27fd1739
commit 50317b111d
4 changed files with 76 additions and 27 deletions
--- 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 += ', '