pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-10-24 00:58:37 +09:00
Code Issues Projects Releases Wiki Activity

changes to use libavformat runtime version when adding aac_adtstoasc filter

Browse Source
This commit is contained in:
kikuyan
2021-07-18 13:40:47 +09:00
parent a803582717
commit 7b0a9430da
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/postprocessor/ffmpeg.py
View File

@@ -77,7 +77,19 @@ class FFmpegPostProcessor(PostProcessor):
prefer_ffmpeg = True
def get_ffmpeg_version(path):
ver = get_exe_version(path, args=['-version'])
if os.path.basename(path) == 'ffmpeg':
# get ffmpeg and libavformat runtime versions
vers = get_exe_version(
path, args=['-version'],
version_re=r'(?s)version\s+([-0-9._a-zA-Z]+)(?:.*?libavformat.*?/\s+([0-9. ]+))?')
if isinstance(vers, (list, tuple)):
ver = vers[0]
if len(vers) > 1 and vers[1]:
self._lavf_version = vers[1].replace(' ', '')
else:
ver = vers
else:
ver = get_exe_version(path, args=['-version'])
if ver:
regexs = [
r'(?:\d+:)?([0-9.]+)-[0-9]+ubuntu[0-9.]+$', # Ubuntu, see [1]
@@ -95,6 +107,7 @@ class FFmpegPostProcessor(PostProcessor):
self._paths = None
self._versions = None
self._lavf_version = None
if self._downloader:
prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', True)
location = self._downloader.params.get('ffmpeg_location')