diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-08 18:32:06 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-08 18:32:06 +0100 |
| commit | 35aa7098cd22249e3ab446925a27c57572ff49d9 (patch) | |
| tree | 961af62fc0af980d803a8b2ab4eb9af02f36ac2e /youtube_dl/__init__.py | |
| parent | 9d6192a5b8d81b2997fa7dc7bb1b2a3db0183a91 (diff) | |
| parent | 76b1bd672d56d4776f377a586a9b64145e089345 (diff) | |
Merge remote-tracking branch 'origin/prefer-ffmpeg'
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 238a0818f..a36101c14 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -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: |