From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 7 Aug 2013 18:11:04 +0000 (+0200)
Subject: Merge commit '7a4c6cc92f9ffec9135652a49153caffa5520c29'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=b513a251f8ba1123617ece96bff30e3f2863c6c2

Merge commit '7a4c6cc92f9ffec9135652a49153caffa5520c29'
---

b513a251f8ba1123617ece96bff30e3f2863c6c2
diff --cc youtube_dl/extractor/youtube.py
index 4d3bce879,7577c12f5..7df79b943
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -331,22 -179,18 +331,22 @@@ class YoutubeIE(YoutubeBaseInfoExtracto
      def _decrypt_signature(self, s):
          """Turn the encrypted s field into a working signature"""
  
 -        if len(s) == 88:
 +        if len(s) == 92:
 +            return s[25] + s[3:25] + s[0] + s[26:42] + s[79] + s[43:79] + s[91] + s[80:83]
 +        elif len(s) == 90:
 +            return s[25] + s[3:25] + s[2] + s[26:40] + s[77] + s[41:77] + s[89] + s[78:81]
 +        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[62] + s[82:62:-1] + s[83] + s[61:52:-1] + s[0] + s[51:2:-1]
 +            return s[4:23] + s[86] + s[24:85]
          elif len(s) == 86:
 -            return s[2:63] + s[82] + s[64:82] + s[63]
 +            return s[83:85] + s[26] + s[79:46:-1] + s[85] + s[45:36:-1] + s[30] + s[35:30:-1] + s[46] + s[29:26:-1] + s[82] + s[25:1:-1]
          elif len(s) == 85:
 -            return s[76] + s[82:76:-1] + s[83] + s[75:60:-1] + s[0] + s[59:50:-1] + s[1] + s[49:2:-1]
 +            return s[2:8] + s[0] + s[9:21] + s[65] + s[22:65] + s[84] + s[66:82] + s[21]
          elif len(s) == 84:
-             return s[83:36:-1] + s[2] + s[35:26:-1] + s[3] + s[25:3:-1] + s[26]
+             return s[83:27:-1] + s[0] + s[26:5:-1] + s[2:0:-1] + s[27]
          elif len(s) == 83:
 -            return s[6] + s[3:6] + s[33] + s[7:24] + s[0] + s[25:33] + s[53] + s[34:53] + s[24] + s[54:]
 +            return s[:15] + s[80] + s[16:80] + s[15]
          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: