MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-25 02:05:50 +01:00
Code Issues Releases Wiki Activity

Prefer ffmpeg over avconv by default (closes #8622)

Browse Source
This commit is contained in:
Sergey M․ 2018-06-29 01:09:14 +07:00
parent acbd0ff5df
commit d4a24f4091
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/YoutubeDL.py
View File

@ -305,8 +305,8 @@ class YoutubeDL(object):
http_chunk_size. http_chunk_size.
The following options are used by the post processors: The following options are used by the post processors:
prefer_ffmpeg: If True, use ffmpeg instead of avconv if both are available, prefer_ffmpeg: If False, use avconv instead of ffmpeg if both are available,
otherwise prefer avconv. otherwise prefer ffmpeg.
postprocessor_args: A list of additional command-line arguments for the postprocessor_args: A list of additional command-line arguments for the
postprocessor. postprocessor.

4
youtube_dl/options.py
View File

@ -841,11 +841,11 @@ def parseOpts(overrideArguments=None):
postproc.add_option( postproc.add_option(
'--prefer-avconv', '--prefer-avconv',
action='store_false', dest='prefer_ffmpeg', action='store_false', dest='prefer_ffmpeg',
help='Prefer avconv over ffmpeg for running the postprocessors (default)') help='Prefer avconv over ffmpeg for running the postprocessors')
postproc.add_option( postproc.add_option(
'--prefer-ffmpeg', '--prefer-ffmpeg',
action='store_true', dest='prefer_ffmpeg', action='store_true', dest='prefer_ffmpeg',
help='Prefer ffmpeg over avconv for running the postprocessors') help='Prefer ffmpeg over avconv for running the postprocessors (default)')
postproc.add_option( postproc.add_option(
'--ffmpeg-location', '--avconv-location', metavar='PATH', '--ffmpeg-location', '--avconv-location', metavar='PATH',
dest='ffmpeg_location', dest='ffmpeg_location',

16
youtube_dl/postprocessor/ffmpeg.py
View File

@ -77,7 +77,7 @@ class FFmpegPostProcessor(PostProcessor):
def _determine_executables(self): def _determine_executables(self):
programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe'] programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
prefer_ffmpeg = False prefer_ffmpeg = True
self.basename = None self.basename = None
self.probe_basename = None self.probe_basename = None
@ -85,7 +85,7 @@ class FFmpegPostProcessor(PostProcessor):
self._paths = None self._paths = None
self._versions = None self._versions = None
if self._downloader: if self._downloader:
prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', False) prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', True)
location = self._downloader.params.get('ffmpeg_location') location = self._downloader.params.get('ffmpeg_location')
if location is not None: if location is not None:
if not os.path.exists(location): if not os.path.exists(location):
@ -117,19 +117,19 @@ class FFmpegPostProcessor(PostProcessor):
(p, get_exe_version(p, args=['-version'])) for p in programs) (p, get_exe_version(p, args=['-version'])) for p in programs)
self._paths = dict((p, p) for p in programs) self._paths = dict((p, p) for p in programs)
if prefer_ffmpeg: if prefer_ffmpeg is False:
prefs = ('ffmpeg', 'avconv')
else:
prefs = ('avconv', 'ffmpeg') prefs = ('avconv', 'ffmpeg')
else:
prefs = ('ffmpeg', 'avconv')
for p in prefs: for p in prefs:
if self._versions[p]: if self._versions[p]:
self.basename = p self.basename = p
break break
if prefer_ffmpeg: if prefer_ffmpeg is False:
prefs = ('ffprobe', 'avprobe')
else:
prefs = ('avprobe', 'ffprobe') prefs = ('avprobe', 'ffprobe')
else:
prefs = ('ffprobe', 'avprobe')
for p in prefs: for p in prefs:
if self._versions[p]: if self._versions[p]:
self.probe_basename = p self.probe_basename = p