1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-10-31 22:55:26 +00:00

Rebased with upstream/master

This commit is contained in:
mcd1992 2014-08-24 15:04:50 -05:00
parent a2360a4c80
commit 7833d941bb
2 changed files with 0 additions and 5 deletions

View file

@ -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

View file

@ -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'