From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 8 May 2014 15:07:14 +0000 (+0700)
Subject: [nfb] Add support for videos with captions (#2866)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f71959fcf5f900b742c336bae402261fbbd8e897;p=youtube-dl

[nfb] Add support for videos with captions (#2866)
---

diff --git a/youtube_dl/extractor/nfb.py b/youtube_dl/extractor/nfb.py
index e88566c69..ba7b77a46 100644
--- a/youtube_dl/extractor/nfb.py
+++ b/youtube_dl/extractor/nfb.py
@@ -73,14 +73,16 @@ class NFBIE(InfoExtractor):
                 title = media.find('title').text
                 description = media.find('description').text
                 # It seems assets always go from lower to better quality, so no need to sort
-                formats = [{
-                    'url': x.find('default/streamerURI').text,
-                    'app': x.find('default/streamerURI').text.split('/', 3)[3],
-                    'play_path': x.find('default/url').text,
-                    'rtmp_live': False,
-                    'ext': 'mp4',
-                    'format_id': x.get('quality'),
-                } for x in media.findall('assets/asset')]
+                for asset in media.findall('assets/asset'):
+                    for x in asset:
+                        formats.append({
+                            'url': x.find('streamerURI').text,
+                            'app': x.find('streamerURI').text.split('/', 3)[3],
+                            'play_path': x.find('url').text,
+                            'rtmp_live': False,
+                            'ext': 'mp4',
+                            'format_id': '%s-%s' % (x.tag, asset.get('quality')),
+                        })
 
         return {
             'id': video_id,