From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 25 Aug 2014 16:36:42 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f971dcbba0671391c0ab3180d02143db28675c9a;hp=-c;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl
---

f971dcbba0671391c0ab3180d02143db28675c9a
diff --combined youtube_dl/extractor/generic.py
index 44f7ea3fd,59cc8a5ff..3a908d01f
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -341,16 -341,6 +341,16 @@@ class GenericIE(InfoExtractor)
                  'uploader': 'www.handjobhub.com',
                  'title': 'Busty Blonde Siri Tit Fuck While Wank at Handjob Hub',
              }
 +        },
 +        # RSS feed
 +        {
 +            'url': 'http://phihag.de/2014/youtube-dl/rss2.xml',
 +            'info_dict': {
 +                'id': 'http://phihag.de/2014/youtube-dl/rss2.xml',
 +                'title': 'Zero Punctuation',
 +                'description': 're:'
 +            },
 +            'playlist_mincount': 11,
          }
      ]
  
@@@ -819,7 -809,6 +819,6 @@@
                      \s*{[^}]+? ["']?clip["']?\s*:\s*\{\s*
                          ["']?url["']?\s*:\s*["']([^"']+)["']
              ''', webpage)
-             assert found
          if not found:
              # Try to find twitter cards info
              found = re.findall(r'<meta (?:property|name)="twitter:player:stream" (?:content|value)="(.+?)"', webpage)