projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f740fae
)
[ffmpeg] Remove trivial helper method
author
Philipp Hagemeister
<phihag@phihag.de>
Tue, 17 Feb 2015 16:27:29 +0000
(17:27 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Tue, 17 Feb 2015 16:27:29 +0000
(17:27 +0100)
youtube_dl/postprocessor/ffmpeg.py
patch
|
blob
|
history
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index e98fe98340aed0b19b0e6c180a22d869c831ae42..3f2e6cf1d38af3c6896cce5c92560f0a0a53d554 100644
(file)
--- a/
youtube_dl/postprocessor/ffmpeg.py
+++ b/
youtube_dl/postprocessor/ffmpeg.py
@@
-37,7
+37,7
@@
class FFmpegPostProcessor(PostProcessor):
if not self.available:
raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
if not self.available:
raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
- required_version = '10-0' if self.
_uses_avconv()
else '1.0'
+ required_version = '10-0' if self.
basename == 'avconv'
else '1.0'
if is_outdated_version(
self._versions[self.basename], required_version):
warning = 'Your copy of %s is outdated, update %s to version %s or newer if you encounter any errors.' % (
if is_outdated_version(
self._versions[self.basename], required_version):
warning = 'Your copy of %s is outdated, update %s to version %s or newer if you encounter any errors.' % (
@@
-112,9
+112,6
@@
class FFmpegPostProcessor(PostProcessor):
def available(self):
return self.basename is not None
def available(self):
return self.basename is not None
- def _uses_avconv(self):
- return self.basename == 'avconv'
-
@property
def executable(self):
return self._paths[self.basename]
@property
def executable(self):
return self._paths[self.basename]