projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[sohu] Modernize and extract all formats and more metadata (Closes #4409, closes...
[youtube-dl]
/
youtube_dl
/
postprocessor
/
ffmpeg.py
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index 9303b8378b8065d84ed2d064ab76aacb463ef6bf..048525efcaa848948c2c4090bd4570599b5e9759 100644
(file)
--- a/
youtube_dl/postprocessor/ffmpeg.py
+++ b/
youtube_dl/postprocessor/ffmpeg.py
@@
-37,11
+37,11
@@
class FFmpegPostProcessor(PostProcessor):
if not self._executable:
raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
if not self._executable:
raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
-
REQUIRED_VERSION =
'1.0'
+
required_version = '10-0' if self._uses_avconv() else
'1.0'
if is_outdated_version(
if is_outdated_version(
- self._versions[self._executable],
REQUIRED_VERSION
):
+ self._versions[self._executable],
required_version
):
warning = 'Your copy of %s is outdated, update %s to version %s or newer if you encounter any errors.' % (
warning = 'Your copy of %s is outdated, update %s to version %s or newer if you encounter any errors.' % (
- self._executable, self._executable,
REQUIRED_VERSION
)
+ self._executable, self._executable,
required_version
)
if self._downloader:
self._downloader.report_warning(warning)
if self._downloader:
self._downloader.report_warning(warning)
@@
-236,9
+236,9
@@
class FFmpegExtractAudioPP(FFmpegPostProcessor):
return self._nopostoverwrites, information
return self._nopostoverwrites, information
-class FFmpegVideoConvertor(FFmpegPostProcessor):
+class FFmpegVideoConvertor
PP
(FFmpegPostProcessor):
def __init__(self, downloader=None, preferedformat=None):
def __init__(self, downloader=None, preferedformat=None):
- super(FFmpegVideoConvertor, self).__init__(downloader)
+ super(FFmpegVideoConvertor
PP
, self).__init__(downloader)
self._preferedformat = preferedformat
def run(self, information):
self._preferedformat = preferedformat
def run(self, information):