mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-01-07 17:16:08 +00:00
Rebased with upstream/master
This commit is contained in:
parent
a2360a4c80
commit
7833d941bb
|
@ -288,8 +288,6 @@ which means you can modify it, redistribute it or use it however you like.
|
||||||
postprocessors (default)
|
postprocessors (default)
|
||||||
--prefer-ffmpeg Prefer ffmpeg over avconv for running the
|
--prefer-ffmpeg Prefer ffmpeg over avconv for running the
|
||||||
postprocessors
|
postprocessors
|
||||||
--exec Execute a command after the file is finished downloading, similar to find's -exec format
|
|
||||||
Example: --exec 'adb push {} /sdcard/Music/ && rm {}'
|
|
||||||
|
|
||||||
# CONFIGURATION
|
# CONFIGURATION
|
||||||
|
|
||||||
|
|
|
@ -71,12 +71,9 @@ __authors__ = (
|
||||||
'Sebastian Haas',
|
'Sebastian Haas',
|
||||||
'Alexander Kirk',
|
'Alexander Kirk',
|
||||||
'Erik Johnson',
|
'Erik Johnson',
|
||||||
<<<<<<< HEAD
|
|
||||||
'Keith Beckman',
|
'Keith Beckman',
|
||||||
'Ole Ernst',
|
'Ole Ernst',
|
||||||
=======
|
|
||||||
'Aaron McDaniel (mcd1992)',
|
'Aaron McDaniel (mcd1992)',
|
||||||
>>>>>>> Implemented --exec option.
|
|
||||||
)
|
)
|
||||||
|
|
||||||
__license__ = 'Public Domain'
|
__license__ = 'Public Domain'
|
||||||
|
|
Loading…
Reference in a new issue