projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spankbang.com' of https://github.com/newtonelectron/youtube-dl into...
[youtube-dl]
/
youtube_dl
/
postprocessor
/
ffmpeg.py
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index 55adf9685b3e1407d6cb1fe1e1205e290203fa95..0b60ac7e750bc2b308e4c7a8c01c8b988b036450 100644
(file)
--- a/
youtube_dl/postprocessor/ffmpeg.py
+++ b/
youtube_dl/postprocessor/ffmpeg.py
@@
-116,6
+116,10
@@
class FFmpegPostProcessor(PostProcessor):
def executable(self):
return self._paths[self.basename]
def executable(self):
return self._paths[self.basename]
+ @property
+ def probe_available(self):
+ return self.probe_basename is not None
+
@property
def probe_executable(self):
return self._paths[self.probe_basename]
@property
def probe_executable(self):
return self._paths[self.probe_basename]
@@
-168,7
+172,7
@@
class FFmpegExtractAudioPP(FFmpegPostProcessor):
def get_audio_codec(self, path):
def get_audio_codec(self, path):
- if not self.probe_
execut
able:
+ if not self.probe_
avail
able:
raise PostProcessingError('ffprobe or avprobe not found. Please install one.')
try:
cmd = [
raise PostProcessingError('ffprobe or avprobe not found. Please install one.')
try:
cmd = [