decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

check for avconv version and use new command line api if needed (to support Ubuntu 14.04)

Browse source
This commit is contained in:
j 2014-07-16 11:04:52 +00:00
commit f0a5f5ddb7
3 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pandora/app/config.py
View file

@ -16,7 +16,7 @@ from django.contrib.auth.models import User
import ox.jsonc
from ox.utils import json
from archive.extract import supported_formats, AVCONV
from archive.extract import supported_formats, AVCONV, avconv_version
from item.utils import get_by_id
@ -142,6 +142,7 @@ check the README for further details.
''' % AVCONV)
settings.AVCONV_VERSION = avconv_version()
settings.CONFIG = config
admin = len(settings.CONFIG['userLevels']) - 1
if not 'syncdb' in sys.argv \