Closes #14: make ffmpeg binary configurable

This commit is contained in:
boyska 2014-04-14 18:50:50 +02:00
parent b152b44071
commit 65aad94f24
2 changed files with 2 additions and 2 deletions

View file

@ -22,3 +22,4 @@ AUDIO_OUTPUT_FORMAT = 'techrec-%(time)s-%(name)s.mp3'
FORGE_TIMEOUT = 20
FORGE_MAX_DURATION = 3600*5
FFMPEG_OPTIONS = ['-loglevel', 'warning', '-n']
FFMPEG_PATH = 'ffmpeg'

View file

@ -59,8 +59,7 @@ def mp3_join(named_intervals, target):
This function make the (quite usual) assumption that the only start_cut (if
any) is at the first file, and the last one is at the last file
'''
# TODO: ffmpeg binary should be configurable
ffmpeg = 'ffmpeg' # binary name
ffmpeg = get_config()['FFMPEG_PATH']
startskip = None
endskip = None
files = []