Browse Source

Rebased with upstream/master

totalwebcasting
mcd1992 10 years ago
parent
commit
7833d941bb
2 changed files with 0 additions and 5 deletions
  1. +0
    -2
      README.md
  2. +0
    -3
      youtube_dl/__init__.py

+ 0
- 2
README.md View File

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


+ 0
- 3
youtube_dl/__init__.py View File

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