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

diff --combined youtube_dl/extractor/generic.py
index f2bb4aa2104c1d306ba658de794be3db4b0d2066,759fd60a73931c177e876b5102c2bd95fc0c60ea..019bbe6e9f7ab7fcec303a44f1e51cc7fba36fa9
--- 1/youtube_dl/extractor/generic.py
--- 2/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -15,15 -15,6 +15,15 @@@ class GenericIE(InfoExtractor)
  
      _VALID_URL = r'.*'
      IE_NAME = u'generic'
 +    _TEST = {
 +        u'url': u'http://www.hodiho.fr/2013/02/regis-plante-sa-jeep.html',
 +        u'file': u'13601338388002.mp4',
 +        u'md5': u'85b90ccc9d73b4acd9138d3af4c27f89',
 +        u'info_dict': {
 +            u"uploader": u"www.hodiho.fr", 
 +            u"title": u"R\u00e9gis plante sa Jeep"
 +        }
 +    }
  
      def report_download_webpage(self, video_id):
          """Report webpage download."""
@@@ -111,7 -102,7 +111,7 @@@
              mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage)
          if mobj is None:
              # Broaden the search a little bit: JWPlayer JS loader
-             mobj = re.search(r'[^A-Za-z0-9]?file:\s*["\'](http[^\'"&]*)', webpage)
+             mobj = re.search(r'[^A-Za-z0-9]?file["\']?:\s*["\'](http[^\'"&]*)', webpage)
          if mobj is None:
              # Try to find twitter cards info
              mobj = re.search(r'<meta (?:property|name)="twitter:player:stream" (?:content|value)="(.+?)"', webpage)
@@@ -144,7 -135,7 +144,7 @@@
          #   Video Title - Tagline | Site Name
          # and so on and so forth; it's just not practical
          video_title = self._html_search_regex(r'<title>(.*)</title>',
-             webpage, u'video title')
+             webpage, u'video title', default=u'video')
  
          # video uploader is domain name
          video_uploader = self._search_regex(r'(?:https?://)?([^/]*)/.*',