浏览代码

Merge remote-tracking branch 'upstream/master'

Pierre Rudloff 12 年之前
父节点
当前提交
cd9c100963
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      youtube_dl/YoutubeDL.py

+ 2 - 1
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: