From 027008b14ebe3d41ac7b9940ab73eaed120dab5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sun, 1 Feb 2015 23:49:23 +0600 Subject: [PATCH] [hls] Fix encode issues on python2 @ Windows --- youtube_dl/downloader/hls.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py index aa58b52ab..b642786cc 100644 --- a/youtube_dl/downloader/hls.py +++ b/youtube_dl/downloader/hls.py @@ -11,6 +11,7 @@ from ..compat import ( compat_urllib_request, ) from ..utils import ( + encodeArgument, encodeFilename, ) @@ -21,18 +22,17 @@ class HlsFD(FileDownloader): self.report_destination(filename) tmpfilename = self.temp_name(filename) - args = [ - '-y', '-i', url, '-f', 'mp4', '-c', 'copy', - '-bsf:a', 'aac_adtstoasc', - encodeFilename(tmpfilename, for_subprocess=True)] - ffpp = FFmpegPostProcessor(downloader=self) program = ffpp._executable if program is None: self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.') return False ffpp.check_version() - cmd = [program] + args + + args = [encodeArgument(opt) for opt in ('-y', '-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc')] + args.append(encodeFilename(tmpfilename, True)) + + cmd = [encodeArgument(program)] + args retval = subprocess.call(cmd) if retval == 0: