0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

use one version of ffmpeg for all tasks, remove avconv dependency, fixes #2606

Browse source
This commit is contained in:
j 2015-01-05 16:07:55 +00:00
commit e1bc418e0c
6 changed files with 61 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pandora/settings.py
View file

@ -152,8 +152,7 @@ LOGGING = {
AUTH_PROFILE_MODULE = 'user.UserProfile'
AUTH_CHECK_USERNAME = True
AVCONV_VERSION = 0
FFMPEG=False
FFMPEG='ffmpeg'
#=========================================================================
#Pan.do/ra related settings settings