summary refs log tree commit diff
diff options
context:
space:
mode:
authorPierre Rudloff <contact@rudloff.pro>2013-08-28 12:20:12 +0200
committerPierre Rudloff <contact@rudloff.pro>2013-08-28 12:20:12 +0200
commitcd9c100963e8b8bf651d1f359e5f7812603ca0fd (patch)
tree34f7dbbec72b386cc9f35fe9b1a1c9edab8eea6d
parentb7f89fe692109368e35b4a0723e1044ed6b51e1e (diff)
parentedde6c56ac20af57d7fd494810834125bbd3728d (diff)
downloadyoutube-dl-cd9c100963e8b8bf651d1f359e5f7812603ca0fd.tar.gz
youtube-dl-cd9c100963e8b8bf651d1f359e5f7812603ca0fd.tar.xz
youtube-dl-cd9c100963e8b8bf651d1f359e5f7812603ca0fd.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--youtube_dl/YoutubeDL.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 3fc4ec378..d5f7c81eb 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -448,7 +448,8 @@ class YoutubeDL(object):
         if self.params.get('forceid', False):
             compat_print(info_dict['id'])
         if self.params.get('forceurl', False):
-            compat_print(info_dict['url'])
+            # For RTMP URLs, also include the playpath
+            compat_print(info_dict['url'] + info_dict.get('play_path', u''))
         if self.params.get('forcethumbnail', False) and 'thumbnail' in info_dict:
             compat_print(info_dict['thumbnail'])
         if self.params.get('forcedescription', False) and 'description' in info_dict: