Imported Upstream version 2014.07.15

[youtubedl] / youtube_dl / downloader / hls.py

diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py
index fa983462babeb6a6bccc2f22992411dd6aea8a5b..9f29e2f8110ef09d8bba4c1d57e38acb8da8a52e 100644 (file)
--- a/youtube_dl/downloader/hls.py
+++ b/youtube_dl/downloader/hls.py
@@ -13,8 +13,10 @@ class HlsFD(FileDownloader):
         self.report_destination(filename)
         tmpfilename = self.temp_name(filename)
 
         self.report_destination(filename)
         tmpfilename = self.temp_name(filename)
 

-        args = ['-y', '-i', url, '-f', 'mp4', '-c', 'copy',
-            '-bsf:a', 'aac_adtstoasc', tmpfilename]
+        args = [
+            '-y', '-i', url, '-f', 'mp4', '-c', 'copy',
+            '-bsf:a', 'aac_adtstoasc',
+            encodeFilename(tmpfilename, for_subprocess=True)]

 
         for program in ['avconv', 'ffmpeg']:
             try:
 
         for program in ['avconv', 'ffmpeg']:
             try:


@@ -23,7 +25,7 @@ class HlsFD(FileDownloader):
             except (OSError, IOError):
                 pass
         else:
             except (OSError, IOError):
                 pass
         else:

-            self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found')
+            self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.')

         cmd = [program] + args
 
         retval = subprocess.call(cmd)
         cmd = [program] + args
 
         retval = subprocess.call(cmd)