summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <[email protected]>2013-10-12 13:49:27 +0200
committerJaime Marquínez Ferrándiz <[email protected]>2013-10-12 13:49:27 +0200
commit4eb7f1d12e512fa69f90d98b2e6e97fa0c04e7a5 (patch)
tree34201de92d02490f2e7ffbaa313530883d57a363
parentb4cdc245cf0af0672207a5090cb6eb6c29606cdb (diff)
downloadyoutube-dl-4eb7f1d12e512fa69f90d98b2e6e97fa0c04e7a5.tar.gz
youtube-dl-4eb7f1d12e512fa69f90d98b2e6e97fa0c04e7a5.zip
FFmpegPostProcessor: print the command line used if the --verbose option is given
-rw-r--r--youtube_dl/PostProcessor.py2
-rw-r--r--youtube_dl/utils.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index fbf8a7f98..0479591f0 100644
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -83,6 +83,8 @@ class FFmpegPostProcessor(PostProcessor):
+ opts +
[encodeFilename(self._ffmpeg_filename_argument(out_path))])
+ if self._downloader.params.get('verbose', False):
+ self._downloader.to_screen(u'[debug] ffmpeg command line: %s' % shell_quote(cmd))
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout,stderr = p.communicate()
if p.returncode != 0:
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 82a1daeb9..0457f3ded 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -9,6 +9,7 @@ import io
import json
import locale
import os
+import pipes
import platform
import re
import socket
@@ -927,3 +928,7 @@ class locked_file(object):
def read(self, *args):
return self.f.read(*args)
+
+
+def shell_quote(args):
+ return ' '.join(map(pipes.quote, args))