diff options
author | Allan Zhou <allanzp@gmail.com> | 2013-08-23 15:33:36 -0700 |
---|---|---|
committer | Allan Zhou <allanzp@gmail.com> | 2013-08-23 15:33:36 -0700 |
commit | 39c6f507df5f69e5d9b41b054205ec310f6427a5 (patch) | |
tree | cc67fa16d63b9f113719da0f937aaf4663227284 /youtube_dl/extractor/common.py | |
parent | 614d9c19c14973122cf900df34ca2f6138b05b43 (diff) | |
parent | d2d1eb5b0a3ad2aa9d4867ba09b4b922b170f36a (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r-- | youtube_dl/extractor/common.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 8009c2d85..52c4483c9 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -47,7 +47,8 @@ class InfoExtractor(object): uploader_id: Nickname or id of the video uploader. location: Physical location of the video. player_url: SWF Player URL (used for rtmpdump). - subtitles: The subtitle file contents. + subtitles: The subtitle file contents as a dictionary in the format + {language: subtitles}. view_count: How many users have watched the video on the platform. urlhandle: [internal] The urlHandle to be used to download the file, like returned by urllib.request.urlopen |