schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add ‘--prefer-avconv’ and ‘--prefer-ffmpeg’ options (#2115)

Browse source 
Affects the ffmpeg post processors, if ‘--prefer-ffmpeg’ is given and both avconv and ffmpeg are installed, it will use ffmpeg. Otherwise it will follow the old behaviour.
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-01-08 17:53:34 +01:00
parent 469ec9416a
commit 76b1bd672d
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
youtube_dl/__init__.py
View file

@ -424,6 +424,10 @@ def parseOpts(overrideArguments=None):
help='write metadata to the video file')
postproc.add_option('--xattrs', action='store_true', dest='xattrs', default=False,
help='write metadata to the video file\'s xattrs (using dublin core and xdg standards)')
postproc.add_option('--prefer-avconv', action='store_false', dest='prefer_ffmpeg',
help='Prefer avconv over ffmpeg for running the postprocessors (default)')
postproc.add_option('--prefer-ffmpeg', action='store_true', dest='prefer_ffmpeg',
help='Prefer ffmpeg over avconv for running the postprocessors')
parser.add_option_group(general)
@ -709,6 +713,7 @@ def _real_main(argv=None):
'socket_timeout': opts.socket_timeout,
'bidi_workaround': opts.bidi_workaround,
'debug_printtraffic': opts.debug_printtraffic,
'prefer_ffmpeg': opts.prefer_ffmpeg,
}
with YoutubeDL(ydl_opts) as ydl: