From: Philipp Hagemeister Date: Mon, 16 Feb 2015 03:09:10 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=5bfd430f81c885decfb3dc7b5ad8478eefbaaaf7;p=youtube-dl Merge remote-tracking branch 'origin/master' --- 5bfd430f81c885decfb3dc7b5ad8478eefbaaaf7 diff --cc youtube_dl/postprocessor/ffmpeg.py index 504a71193,5238ce534..16babf6a5 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@@ -174,12 -131,10 +174,12 @@@ class FFmpegExtractAudioPP(FFmpegPostPr raise PostProcessingError('ffprobe or avprobe not found. Please install one.') try: cmd = [ - encodeFilename(self._probe_executable, True), + encodeFilename(self.probe_executable, True), encodeArgument('-show_streams'), encodeFilename(self._ffmpeg_filename_argument(path), True)] + if self._downloader.params.get('verbose', False): - self._downloader.to_screen('[debug] ffprobe command line: %s' % shell_quote(cmd)) - handle = subprocess.Popen(cmd, stderr=compat_subprocess_get_DEVNULL(), stdout=subprocess.PIPE) ++ self._downloader.to_screen('[debug] %s command line: %s' % (self.basename, shell_quote(cmd))) + handle = subprocess.Popen(cmd, stderr=compat_subprocess_get_DEVNULL(), stdout=subprocess.PIPE, stdin=subprocess.PIPE) output = handle.communicate()[0] if handle.wait() != 0: return None