From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 28 Aug 2013 10:20:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cd9c100963e8b8bf651d1f359e5f7812603ca0fd;hp=b7f89fe692109368e35b4a0723e1044ed6b51e1e;p=youtube-dl

Merge remote-tracking branch 'upstream/master'
---

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: