youtube-dl

commit 15644a40df9881162bfdeec6e4f6b798894f0e47
parent d4800f3c3f370d8d120131439726bf6060612836
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon,  8 Dec 2014 17:21:56 +0100

Merge pull request #4395 from cryptonaut/issue2883

Handle --get-url with merged formats (fixes #2883)
Diffstat:
M
youtube_dl/YoutubeDL.py
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -942,8 +942,12 @@ class YoutubeDL(object):
         if self.params.get('forceid', False):
             self.to_stdout(info_dict['id'])
         if self.params.get('forceurl', False):
-            # For RTMP URLs, also include the playpath
-            self.to_stdout(info_dict['url'] + info_dict.get('play_path', ''))
+            if info_dict.get('requested_formats') is not None:
+                for f in info_dict['requested_formats']:
+                    self.to_stdout(f['url'] + f.get('play_path', ''))
+            else:
+                # For RTMP URLs, also include the playpath
+                self.to_stdout(info_dict['url'] + info_dict.get('play_path', ''))
         if self.params.get('forcethumbnail', False) and info_dict.get('thumbnail') is not None:
             self.to_stdout(info_dict['thumbnail'])
         if self.params.get('forcedescription', False) and info_dict.get('description') is not None: