diff options
author | Emilien Kenler <[email protected]> | 2013-08-18 11:12:38 +0200 |
---|---|---|
committer | Emilien Kenler <[email protected]> | 2013-08-18 11:12:38 +0200 |
commit | 12e895fc5a28d0cd9d93d74be5aeb055c48cfdd4 (patch) | |
tree | 36a465a1d0c768abb8b6b917d9fee1952ca05dcf | |
parent | bda2c49d75e9cd34e8ece2fa3e5375365a84f290 (diff) | |
parent | ddf3bd328b0077f3a88ff96e7f17bcd89baaeeac (diff) | |
download | youtube-dl-12e895fc5a28d0cd9d93d74be5aeb055c48cfdd4.tar.gz youtube-dl-12e895fc5a28d0cd9d93d74be5aeb055c48cfdd4.zip |
Merge branch 'master' into py-generator
-rw-r--r-- | youtube_dl/extractor/youtube.py | 6 | ||||
-rw-r--r-- | youtube_dl/version.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 3a8edbdc2..f74718950 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -340,15 +340,15 @@ class YoutubeIE(YoutubeBaseInfoExtractor): elif len(s) == 88: return s[48] + s[81:67:-1] + s[82] + s[66:62:-1] + s[85] + s[61:48:-1] + s[67] + s[47:12:-1] + s[3] + s[11:3:-1] + s[2] + s[12] elif len(s) == 87: - return s[83:53:-1] + s[3] + s[52:40:-1] + s[86] + s[39:10:-1] + s[0] + s[9:3:-1] + s[53] + return s[6:27] + s[4] + s[28:39] + s[27] + s[40:59] + s[2] + s[60:] elif len(s) == 86: return s[5:20] + s[2] + s[21:] elif len(s) == 85: - return s[2:8] + s[0] + s[9:21] + s[65] + s[22:65] + s[84] + s[66:82] + s[21] + return s[83:34:-1] + s[0] + s[33:27:-1] + s[3] + s[26:19:-1] + s[34] + s[18:3:-1] + s[27] elif len(s) == 84: return s[83:27:-1] + s[0] + s[26:5:-1] + s[2:0:-1] + s[27] elif len(s) == 83: - return s[:15] + s[80] + s[16:80] + s[15] + return s[81:64:-1] + s[82] + s[63:52:-1] + s[45] + s[51:45:-1] + s[1] + s[44:1:-1] + s[0] elif len(s) == 82: return s[36] + s[79:67:-1] + s[81] + s[66:40:-1] + s[33] + s[39:36:-1] + s[40] + s[35] + s[0] + s[67] + s[32:0:-1] + s[34] elif len(s) == 81: diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 8c9fc201b..8c93a275c 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2013.08.09' +__version__ = '2013.08.17' |