Tidy the changelog.

[youtubedl] / youtube_dl / downloader / hls.py

diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py
index 954beffd50e51db43ce203931d31ad2fbeee95dc..e527ee425365a096b50f541b1c75c82dcb9013fb 100644 (file)
--- a/youtube_dl/downloader/hls.py
+++ b/youtube_dl/downloader/hls.py
@@ -4,11 +4,14 @@ import os
 import re
 import subprocess
 
 import re
 import subprocess
 

+from ..postprocessor.ffmpeg import FFmpegPostProcessor

 from .common import FileDownloader
 from .common import FileDownloader

-from ..utils import (
+from ..compat import (

     compat_urlparse,
     compat_urllib_request,
     compat_urlparse,
     compat_urllib_request,

-    check_executable,
+)
+from ..utils import (
+    encodeArgument,

     encodeFilename,
 )
 
     encodeFilename,
 )
 


@@ -19,23 +22,22 @@ 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',
-            encodeFilename(tmpfilename, for_subprocess=True)]
-
-        for program in ['avconv', 'ffmpeg']:
-            if check_executable(program, ['-version']):
-                break
-        else:
+        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
             self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
             return False

-        cmd = [program] + args
+        ffpp.check_version()
+
+        args = [
+            encodeArgument(opt)
+            for opt in (program, '-y', '-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc')]
+        args.append(encodeFilename(tmpfilename, True))

 
 

-        retval = subprocess.call(cmd)
+        retval = subprocess.call(args)

         if retval == 0:
             fsize = os.path.getsize(encodeFilename(tmpfilename))
         if retval == 0:
             fsize = os.path.getsize(encodeFilename(tmpfilename))

-            self.to_screen('\r[%s] %s bytes' % (cmd[0], fsize))
+            self.to_screen('\r[%s] %s bytes' % (args[0], fsize))

             self.try_rename(tmpfilename, filename)
             self._hook_progress({
                 'downloaded_bytes': fsize,
             self.try_rename(tmpfilename, filename)
             self._hook_progress({
                 'downloaded_bytes': fsize,