aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/options.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-13 11:14:01 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-16 04:05:53 +0100
commit73fac4e9119bc53d49e646c38529f1b6d8de734d (patch)
tree91609ff56015f7e406924164fa73bbc4bb6e23fd /youtube_dl/options.py
parentc80b9cd280020e4e70e0d4336387d83101bcf50f (diff)
downloadyoutube-dl-73fac4e9119bc53d49e646c38529f1b6d8de734d.tar.xz
[ffmpeg] Add --ffmpeg-location
Diffstat (limited to 'youtube_dl/options.py')
-rw-r--r--youtube_dl/options.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 873432bee..ba35399cf 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -736,6 +736,10 @@ def parseOpts(overrideArguments=None):
action='store_true', dest='prefer_ffmpeg',
help='Prefer ffmpeg over avconv for running the postprocessors')
postproc.add_option(
+ '--ffmpeg-location', '--avconv-location', metavar='PATH',
+ dest='ffmpeg_location',
+ help='Location of the ffmpeg/avconv binary; either the path to the binary or its containing directory.')
+ postproc.add_option(
'--exec',
metavar='CMD', dest='exec_cmd',
help='Execute a command on the file after downloading, similar to find\'s -exec syntax. Example: --exec \'adb push {} /sdcard/Music/ && rm {}\'')