From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 26 Mar 2016 10:34:51 +0000 (+0800)
Subject: [twitter] Fix extraction (closes #8966)
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e68d3a010fcf34455c7922b28a05ccc012381729;p=youtube-dl

[twitter] Fix extraction (closes #8966)

HLS and DASH formats are no longer appeared in test cases. I keep them
for fear of triggering new errors.
---

diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py
index e70b2ab3c..602538e5c 100644
--- a/youtube_dl/extractor/twitter.py
+++ b/youtube_dl/extractor/twitter.py
@@ -110,10 +110,9 @@ class TwitterCardIE(TwitterBaseIE):
                     'height': int(m.group('height')),
                 })
 
-        playlist = config.get('playlist')
-        if playlist:
-            video_url = playlist[0]['source']
+        video_url = config.get('video_url') or config.get('playlist', [{}])[0].get('source')
 
+        if video_url:
             f = {
                 'url': video_url,
             }
@@ -185,7 +184,6 @@ class TwitterIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'FREE THE NIPPLE - FTN supporters on Hollywood Blvd today!',
             'thumbnail': 're:^https?://.*\.jpg',
-            'duration': 12.922,
             'description': 'FREE THE NIPPLE on Twitter: "FTN supporters on Hollywood Blvd today! http://t.co/c7jHH749xJ"',
             'uploader': 'FREE THE NIPPLE',
             'uploader_id': 'freethenipple',