Rebased with upstream/master

pull/8/head
mcd1992 10 years ago
parent a2360a4c80
commit 7833d941bb

@ -288,8 +288,6 @@ which means you can modify it, redistribute it or use it however you like.
postprocessors (default)
--prefer-ffmpeg Prefer ffmpeg over avconv for running the
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

@ -71,12 +71,9 @@ __authors__ = (
'Sebastian Haas',
'Alexander Kirk',
'Erik Johnson',
<<<<<<< HEAD
'Keith Beckman',
'Ole Ernst',
=======
'Aaron McDaniel (mcd1992)',
>>>>>>> Implemented --exec option.
)
__license__ = 'Public Domain'

Loading…
Cancel
Save