Merge pull request #1342 from cnbeining/fix-ffmpeg-and-douyu

Fix ffmpeg wrong folder format and douyu discard output folder
This commit is contained in:
David Zhuang 2016-08-11 03:38:39 -04:00 committed by GitHub
commit c6784f2fb8
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ def douyutv_download(url, output_dir = '.', merge = True, info_only = False, **k
print_info(site_info, title, 'flv', float('inf')) print_info(site_info, title, 'flv', float('inf'))
if not info_only: if not info_only:
download_url_ffmpeg(real_url, title, 'flv', None, output_dir, merge = merge) download_url_ffmpeg(real_url, title, 'flv', None, output_dir = output_dir, merge = merge)
site_info = "douyu.com" site_info = "douyu.com"
download = douyutv_download download = douyutv_download

View File

@ -209,7 +209,7 @@ def ffmpeg_download_stream(files, title, ext, params={}, output_dir='.'):
output = title + '.' + ext output = title + '.' + ext
if not (output_dir == '.'): if not (output_dir == '.'):
output = output_dir + output output = output_dir + '/' + output
ffmpeg_params = [] ffmpeg_params = []
#should these exist... #should these exist...