Browse Source

Merge remote-tracking branch 'upstream/master'

rtmp_test
Pierre Rudloff 11 years ago
parent
commit
cd9c100963
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      youtube_dl/YoutubeDL.py

+ 2
- 1
youtube_dl/YoutubeDL.py View File

@ -448,7 +448,8 @@ class YoutubeDL(object):
if self.params.get('forceid', False): if self.params.get('forceid', False):
compat_print(info_dict['id']) compat_print(info_dict['id'])
if self.params.get('forceurl', False): 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: if self.params.get('forcethumbnail', False) and 'thumbnail' in info_dict:
compat_print(info_dict['thumbnail']) compat_print(info_dict['thumbnail'])
if self.params.get('forcedescription', False) and 'description' in info_dict: if self.params.get('forcedescription', False) and 'description' in info_dict:


Loading…
Cancel
Save