nhyatt/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-06-30 11:02:51 -05:00
Code Issues Projects Releases Wiki Activity

[ffmpeg] Improve version check and call it from hls (Fixes #4377)

Browse Source
This commit is contained in:
Philipp Hagemeister
2014-12-06 12:14:26 +01:00
parent f6735be4da
commit 5f9b83944d
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/postprocessor/ffmpeg.py
View File

@ -37,11 +37,11 @@ class FFmpegPostProcessor(PostProcessor):
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(
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.' % (
self._executable, self._executable, REQUIRED_VERSION)
self._executable, self._executable, required_version)
if self._downloader:
self._downloader.report_warning(warning)