diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-22 22:30:06 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-22 22:30:06 +0200 |
| commit | 7853cc5ae1f9068f3bdf59ce959cb70645b9bc20 (patch) | |
| tree | 82f0855ff96d3027c2026d2460a2a6c14d0fa6cc /youtube_dl/extractor/common.py | |
| parent | 586a91b67f6fe7254beefc3831b4e4649f84f0ce (diff) | |
| parent | b028e96144a2bf1ba84dd6d11f1cc13a2928c438 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
youtube_dl/YoutubeDL.py
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index d4af3b5eb..7d7ce5d98 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -61,9 +61,12 @@ class InfoExtractor(object): * ext Will be calculated from url if missing * format A human-readable description of the format ("mp4 container with h264/opus"). - Calculated from width and height if missing. + Calculated from the format_id, width, height + and format_note fields if missing. * format_id A short description of the format ("mp4_h264_opus" or "19") + * format_note Additional info about the format + ("3D" or "DASH video") * width Width of the video, if known * height Height of the video, if known |