0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use local ffmpeg path

Browse source
This commit is contained in:
j 2013-04-29 15:59:48 +02:00
parent ed5afd667c
commit 97ed530717
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora_client/client.py
View file

@ -9,6 +9,7 @@ import sys
import requests import requests
import extract
class DistributedClient: class DistributedClient:
@ -39,6 +40,7 @@ class DistributedClient:
return False return False
def encode(self, oshash, cmd, output): def encode(self, oshash, cmd, output):
cmd[0] = extract.command('ffmpeg')
try: try:
p = subprocess.Popen(cmd) p = subprocess.Popen(cmd)
r = None r = None

2
pandora_client/server.py
View file

@ -131,7 +131,7 @@ class Server(Resource):
url = 'http://%s:%s/get/%s' % (request.host.host, request.host.port, oshash) url = 'http://%s:%s/get/%s' % (request.host.host, request.host.port, oshash)
output = '/tmp/%s.%s' % (oshash, self.client.profile) output = '/tmp/%s.%s' % (oshash, self.client.profile)
response['cmd'] = extract.video_cmd(url, output, self.client.profile, info) response['cmd'] = extract.video_cmd(url, output, self.client.profile, info)
response['cmd'][0] = 'avconv' response['cmd'][0] = 'ffmpeg'
response['output'] = output response['output'] = output
self.update_status(oshash, 'active') self.update_status(oshash, 'active')
print oshash, f print oshash, f