From: Random User <rndusr@posteo.de>
Date: Sat, 25 Mar 2017 20:36:59 +0000 (+0100)
Subject: Merge branch 'master' of github.com-rndusr:rg3/youtube-dl into fix/str-item-assignment
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=4f06c1c9fcbfbc74b81b5fa89a616914b5ce5aad

Merge branch 'master' of github.com-rndusr:rg3/youtube-dl into fix/str-item-assignment
---

4f06c1c9fcbfbc74b81b5fa89a616914b5ce5aad
diff --cc youtube_dl/extractor/generic.py
index 3fe0237b6,4fff93efe..274f81738
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -2518,10 -2550,18 +2564,14 @@@ class GenericIE(InfoExtractor)
                  self._sort_formats(entry['formats'])
              return self.playlist_result(entries)
  
 -        jwplayer_data_str = self._find_jwplayer_data(webpage)
 -        if jwplayer_data_str:
 -            try:
 -                jwplayer_data = self._parse_json(
 -                    jwplayer_data_str, video_id, transform_source=js_to_json)
 -                info = self._parse_jwplayer_data(
 -                    jwplayer_data, video_id, require_title=False)
 -                if not info.get('title'):
 -                    info['title'] = video_title
 -                return info
 -            except ExtractorError:
 -                pass
 +        jwplayer_data = self._find_jwplayer_data(
 +            webpage, video_id, transform_source=js_to_json)
 +        if jwplayer_data:
-             return self._parse_jwplayer_data(jwplayer_data, video_id)
++            info = self._parse_jwplayer_data(
++                jwplayer_data, video_id, require_title=False)
++            if not info.get('title'):
++                info['title'] = video_title
++            return info
  
          def check_video(vurl):
              if YoutubeIE.suitable(vurl):