Merge branch 'redesign2017' of /f/gitRepositories/judo into redesign2018

This commit is contained in:
marko
2019-01-08 14:38:33 +01:00
11 changed files with 70 additions and 25 deletions

View File

@@ -34,7 +34,7 @@ def probe(vid_file_path):
pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
out, err = pipe.communicate()
return json.loads(out)
return json.loads(out.decode('utf-8'))
def duration(vid_file_path):

View File

@@ -1,7 +1,7 @@
<?php
$basePath = "/users/cwsvjudo/www";
include_once("config.inc.php");
$basePath = "/users/cwsvjudo/www";
require_once($basePath."/config/cwsvJudo.config.php");